Auto merge of #59799 - Zoxc:vs2019, r=alexcrichton

Update cmake, cc and compiler_builtins for VS 2019 support

r? @alexcrichton

Author: bors

Cargo.lock

@@ -36,11 +36,11 @@ test = false
 
 [dependencies]
 build_helper = { path = "../build_helper" }
-cmake = "0.1.23"
+cmake = "0.1.38"
 filetime = "0.2"
 num_cpus = "1.0"
 getopts = "0.2"
-cc = "1.0.1"
+cc = "1.0.35"
 libc = "0.2"
 serde = "1.0.8"
 serde_derive = "1.0.8"

src/bootstrap/Cargo.toml

@@ -131,6 +131,11 @@ pub fn check(build: &mut Build) {
             continue;
         }
 
+        // We don't use a C compiler on wasm32
+        if target.contains("wasm32") {
+            continue;
+        }
+
         if !build.config.dry_run {
             cmd_finder.must_have(build.cc(*target));
             if let Some(ar) = build.ar(*target) {

src/bootstrap/sanity.rs

@@ -1016,7 +1016,10 @@ impl Step for Compiletest {
         // Also provide `rust_test_helpers` for the host.
         builder.ensure(native::TestHelpers { target: compiler.host });
 
-        builder.ensure(native::TestHelpers { target });
+        // wasm32 can't build the test helpers
+        if !target.contains("wasm32") {
+            builder.ensure(native::TestHelpers { target });
+        }
         builder.ensure(RemoteCopyLibs { compiler, target });
 
         let mut cmd = builder.tool_cmd(Tool::Compiletest);

src/bootstrap/test.rs

@@ -12,7 +12,7 @@ path = "lib.rs"
 
 [dependencies]
 core = { path = "../libcore" }
-compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }
+compiler_builtins = { version = "0.1.10", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]
 rand = "0.6"

src/liballoc/Cargo.toml

@@ -12,7 +12,7 @@ test = false
 
 [build-dependencies]
 build_helper = { path = "../build_helper" }
-cmake = "0.1.18"
+cmake = "0.1.38"
 
 [dependencies]
 alloc = { path = "../liballoc" }

src/librustc_asan/Cargo.toml

@@ -12,7 +12,7 @@ test = false
 
 [build-dependencies]
 build_helper = { path = "../build_helper" }
-cmake = "0.1.18"
+cmake = "0.1.38"
 
 [dependencies]
 alloc = { path = "../liballoc" }

src/librustc_lsan/Cargo.toml

@@ -12,7 +12,7 @@ test = false
 
 [build-dependencies]
 build_helper = { path = "../build_helper" }
-cmake = "0.1.18"
+cmake = "0.1.38"
 
 [dependencies]
 alloc = { path = "../liballoc" }

src/librustc_msan/Cargo.toml

@@ -12,7 +12,7 @@ test = false
 
 [build-dependencies]
 build_helper = { path = "../build_helper" }
-cmake = "0.1.18"
+cmake = "0.1.38"
 
 [dependencies]
 alloc = { path = "../liballoc" }