Backed out 2 changesets (bug 1562389) for causing bustages in ../python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py::WindowsToolchainTest::test_clang_cl CLOSED TREE
authorshindli <shindli@mozilla.com>
Thu, 04 Jul 2019 07:44:49 +0300
changeset 540865 41de4f2ef2136f650bf07e070e94a798173b8688
parent 540864 7dbb546e613875cec06e1615c42dd7c4266fe170
child 540866 6a2bd09a6bf9aada14581e923408d7308479b76d
push id11529
push userarchaeopteryx@coole-files.de
push dateThu, 04 Jul 2019 15:22:33 +0000
treeherdermozilla-beta@ebb510a784b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1562389
milestone69.0a1
backs out7dbb546e613875cec06e1615c42dd7c4266fe170
68ad44276058484da94325b0b221e6b638e52ae3
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
Backed out 2 changesets (bug 1562389) for causing bustages in ../python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py::WindowsToolchainTest::test_clang_cl CLOSED TREE Backed out changeset 7dbb546e6138 (bug 1562389) Backed out changeset 68ad44276058 (bug 1562389)
build/moz.configure/rust.configure
build/moz.configure/toolchain.configure
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -214,27 +214,27 @@ def rust_supported_targets(rustc):
                 raw_os = 'linux-androideabi'
             per_raw_os[(t.cpu, endianness, raw_os)] = t
         else:
             per_os[key] = t
     return namespace(per_os=per_os, per_raw_os=per_raw_os)
 
 
 @template
-def rust_triple_alias(host_or_target, host_or_target_c_compiler):
+def rust_triple_alias(host_or_target):
     """Template defining the alias used for rustc's --target flag.
     `host_or_target` is either `host` or `target` (the @depends functions
     from init.configure).
     """
     assert host_or_target in {host, target}
 
     host_or_target_str = {host: 'host', target: 'target'}[host_or_target]
 
-    @depends(rustc, host_or_target, host_or_target_c_compiler,
-             rust_supported_targets, arm_target, when=rust_compiler)
+    @depends(rustc, host_or_target, c_compiler, rust_supported_targets,
+             arm_target, when=rust_compiler)
     @checking('for rust %s triplet' % host_or_target_str)
     @imports('os')
     @imports('subprocess')
     @imports(_from='mozbuild.configure.util', _import='LineIO')
     @imports(_from='mozbuild.shellutil', _import='quote')
     @imports(_from='tempfile', _import='mkstemp')
     @imports(_from='textwrap', _import='dedent')
     def rust_target(rustc, host_or_target, compiler_info,
@@ -319,18 +319,18 @@ def rust_triple_alias(host_or_target, ho
             os.remove(out_path)
 
         # This target is usable.
         return rustc_target.alias
 
     return rust_target
 
 
-rust_target_triple = rust_triple_alias(target, c_compiler)
-rust_host_triple = rust_triple_alias(host, host_c_compiler)
+rust_target_triple = rust_triple_alias(target)
+rust_host_triple = rust_triple_alias(host)
 
 
 @depends(host, rust_host_triple, rustc_info.host)
 def validate_rust_host_triple(host, rust_host, rustc_host):
     if rust_host != rustc_host:
         if host.alias == rust_host:
             configure_host = host.alias
         else:
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -415,19 +415,21 @@ def get_compiler_info(compiler, language
     # in Xcode have a completely different versioning scheme despite exposing
     # the version with the same defines.
     # So instead, we make things such that the version is missing when the
     # clang used is below the minimum supported version (currently clang 4.0).
     # We then only include the version information when the compiler matches
     # the feature check, so that an unsupported version of clang would have
     # no version number.
     check = dedent('''\
-        #if defined(_MSC_VER) && defined(__clang__) && defined(_MT)
+        #if defined(_MSC_VER)
+        #if defined(__clang__)
         %COMPILER "clang-cl"
         %VERSION __clang_major__.__clang_minor__.__clang_patchlevel__
+        #endif
         #elif defined(__clang__)
         %COMPILER "clang"
         #  if __has_attribute(diagnose_if)
         %VERSION __clang_major__.__clang_minor__.__clang_patchlevel__
         #  endif
         #elif defined(__GNUC__)
         %COMPILER "gcc"
         %VERSION __GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__