Bug 1298387 - disable x86 assembly sources for libtheora when compiling with clang-cl; r?rillian
MozReview-Commit-ID: 3DHvAC6XHjB
--- 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: