From dca7d2ff62573fe32bb10c724498b8809bd15b2e Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Sat, 23 Jul 2022 07:17:30 -0500 Subject: [PATCH] Issue #1962 - Follow-up: Fix 32-bit build and remove unused clang-cl codepath. --- media/libtheora/moz.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/media/libtheora/moz.build b/media/libtheora/moz.build index 14e9392e02..bca5dafc1f 100644 --- a/media/libtheora/moz.build +++ b/media/libtheora/moz.build @@ -60,10 +60,9 @@ if CONFIG['INTEL_ARCHITECTURE']: if CONFIG['CPU_ARCH'] == 'x86_64': DEFINES['OC_X86_64_ASM'] = True if CONFIG['_MSC_VER']: - if CONFIG['CC_TYPE'] == 'clang-cl': - # clang-cl can't handle libtheora's inline asm. - pass - elif CONFIG['CPU_ARCH'] == 'x86_64': + # MSVC doesn't allow inline assembly in 64-bit code. + # Thus, only 32-bit Windows builds benefit from optimization. + if CONFIG['CPU_ARCH'] != 'x86_64': SOURCES += [ 'lib/x86_vc/mmxfrag.c', 'lib/x86_vc/mmxidct.c',