Bug 1321651 - revert clang-cl changes from bug 1298418 that are no longer needed. r=froydnj
authorDavid Major <dmajor@mozilla.com>
Fri, 05 Jan 2018 14:16:08 -0500
changeset 449823 6d0debde5c246371ca8771c6b3e78291fc53939d
parent 449822 96efa1b6f4d5266a3c5cabc24ac46ca701986b8a
child 449824 44d2697ba0a3456e3016e356abb4663b6aff1a9b
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1321651, 1298418
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1321651 - revert clang-cl changes from bug 1298418 that are no longer needed. r=froydnj
media/ffvpx/ffvpxcommon.mozbuild
--- a/media/ffvpx/ffvpxcommon.mozbuild
+++ b/media/ffvpx/ffvpxcommon.mozbuild
@@ -108,23 +108,8 @@ elif CONFIG['CC_TYPE'] in ('msvc', 'clan
 DEFINES['HAVE_AV_CONFIG_H'] = True
 
 if CONFIG['MOZ_DEBUG']:
     # Enable all assertions in debug builds.
     DEFINES['ASSERT_LEVEL'] = 2
 elif not CONFIG['RELEASE_OR_BETA']:
     # Enable fast assertions in opt builds of Nightly and Aurora.
     DEFINES['ASSERT_LEVEL'] = 1
-
-# clang-cl's <intrin.h> doesn't work the same as MSVC's.  For details, see:
-#
-# http://lists.llvm.org/pipermail/cfe-dev/2016-September/050943.html
-#
-# As a temporary workaround while upstream decides how to address this,
-# we enable modules to make <intrin.h> more MSVC-compatible.
-if CONFIG['CC_TYPE'] == 'clang-cl':
-    CFLAGS += [
-        '-Xclang',
-        '-fmodules',
-        '-Xclang',
-        '-fmodules-cache-path=' + TOPOBJDIR + '/media/ffpvx',
-        '-fbuiltin-module-map',
-    ]