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

@@ -219,7 +219,7 @@ def rust_supported_targets(rustc):
 
 
 @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).
@@ -228,8 +228,8 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler):
 
     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')
@@ -324,8 +324,8 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler):
     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)

build/moz.configure/toolchain.configure

@@ -420,9 +420,11 @@ def get_compiler_info(compiler, language):
     # 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)