Bug 1298387 - disable x86 assembly sources for libtheora when compiling with clang-cl; r=rillian
authorNathan Froyd <froydnj@mozilla.com>
Fri, 26 Aug 2016 14:30:38 -0400
changeset 345717 8ab39d701f57e4fe3f8588ecbbbc9fb0ae2ddbd1
parent 345716 f4ffc342eaac01e12e5dd771b3b95a1c95e29985
child 345718 ef5324ac2924eaacc049c4708a12e8e9e21851ab
push id9
push userfmarier@mozilla.com
push dateTue, 27 Sep 2016 20:38:09 +0000
reviewersrillian
bugs1298387
milestone52.0a1
Bug 1298387 - disable x86 assembly sources for libtheora when compiling with clang-cl; r=rillian MozReview-Commit-ID: 3DHvAC6XHjB
media/libtheora/moz.build
--- a/media/libtheora/moz.build
+++ b/media/libtheora/moz.build
@@ -47,22 +47,28 @@ UNIFIED_SOURCES += [
     'lib/quant.c',
     'lib/state.c',
 ]
 
 LOCAL_INCLUDES += ['include']
 
 if '86' in CONFIG['OS_TEST']:
     if CONFIG['OS_ARCH'] != 'SunOS':
-        if CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':
+        if CONFIG['CLANG_CL']:
+            # clang-cl can't handle libtheora's inline asm.
+            pass
+        elif CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':
             DEFINES['OC_X86_ASM'] = True
             if '64' in CONFIG['OS_TEST']:
                 DEFINES['OC_X86_64_ASM'] = True
     if CONFIG['_MSC_VER']:
-        if '64' not in CONFIG['OS_TEST']:
+        if CONFIG['CLANG_CL']:
+            # clang-cl can't handle libtheora's inline asm.
+            pass
+        elif '64' not in CONFIG['OS_TEST']:
             SOURCES += [
                 'lib/x86_vc/mmxfrag.c',
                 'lib/x86_vc/mmxidct.c',
                 'lib/x86_vc/mmxstate.c',
                 'lib/x86_vc/x86cpu.c',
                 'lib/x86_vc/x86state.c',
             ]
     else: