Bug 1193452 - don't use -fallback with clang-cl; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Wed, 21 Dec 2016 06:56:48 -0500
changeset 326956 427341f59d73784a21b2206da54d66d0e9a59a1a
parent 326955 732bfa4cc97a919ea20fbb438cbb190fdb82b698
child 326957 d7ea845356af1160a97486c853418538193d2884
push id31116
push userkwierso@gmail.com
push dateFri, 23 Dec 2016 02:37:16 +0000
treeherdermozilla-central@2785aaf276ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1193452
milestone53.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 1193452 - don't use -fallback with clang-cl; r=glandium We no longer need this.
build/moz.configure/toolchain.configure
python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -365,23 +365,21 @@ def check_compiler(compiler, language, t
     if info.language == 'C++':
         if info.type in ('clang', 'gcc') and info.language_version != 201103:
             append_flag('-std=gnu++11')
         # MSVC 2015 headers include C++14 features, but don't guard them
         # with appropriate checks.
         if info.type == 'clang-cl' and info.language_version != 201402:
             append_flag('-std=c++14')
 
-    # We force clang-cl to emulate Visual C++ 2015 Update 3 with fallback to
-    # cl.exe.
+    # We force clang-cl to emulate Visual C++ 2015 Update 3.
     if info.type == 'clang-cl' and info.version != '19.00.24213':
-        # Those flags are direct clang-cl flags that don't need -Xclang, add
-        # them directly.
+        # This flag is a direct clang-cl flag that doesn't need -Xclang,
+        # add it directly.
         flags.append('-fms-compatibility-version=19.00.24213')
-        flags.append('-fallback')
 
     # Check compiler target
     # --------------------------------------------------------------------
     if not info.cpu or info.cpu != target.cpu:
         if info.type == 'clang':
             append_flag('--target=%s' % target.toolchain)
         elif info.type == 'gcc':
             same_arch_different_bits = (
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -781,25 +781,25 @@ class WindowsToolchainTest(BaseToolchain
         flags=[],
         version='19.00.24213',
         type='msvc',
         compiler='/usr/bin/cl',
         language='C++',
     )
     CLANG_CL_3_9_RESULT = CompilerResult(
         flags=['-Xclang', '-std=gnu99',
-               '-fms-compatibility-version=19.00.24213', '-fallback'],
+               '-fms-compatibility-version=19.00.24213'],
         version='19.00.24213',
         type='clang-cl',
         compiler='/usr/bin/clang-cl',
         language='C',
     )
     CLANGXX_CL_3_9_RESULT = CompilerResult(
         flags=['-Xclang', '-std=c++14',
-               '-fms-compatibility-version=19.00.24213', '-fallback'],
+               '-fms-compatibility-version=19.00.24213'],
         version='19.00.24213',
         type='clang-cl',
         compiler='/usr/bin/clang-cl',
         language='C++',
     )
     CLANG_3_3_RESULT = LinuxToolchainTest.CLANG_3_3_RESULT
     CLANGXX_3_3_RESULT = LinuxToolchainTest.CLANGXX_3_3_RESULT
     CLANG_3_6_RESULT = LinuxToolchainTest.CLANG_3_6_RESULT