Rollup merge of rust-lang#41975 - liranringel:pass-static-crt-to-llvm-cmake-config, r=alexcrichton

Mark-Simulacrum · web-flow · commit 6764ae13becd · 2017-05-13T20:55:13.000-06:00
Pass static crt to llvm cmake configuration Solves rust-lang#40246
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
@@ -30,11 +30,11 @@ test = false
 
 [dependencies]
 build_helper = { path = "../build_helper" }
-cmake = "0.1.17"
+cmake = "0.1.23"
 filetime = "0.1"
 num_cpus = "1.0"
 toml = "0.1"
 getopts = "0.2"
 rustc-serialize = "0.3"
-gcc = "0.3.38"
+gcc = "0.3.46"
 libc = "0.2"
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -108,6 +108,7 @@ pub fn llvm(build: &Build, target: &str) {
         cfg.define("LLVM_USE_CRT_DEBUG", "MT");
         cfg.define("LLVM_USE_CRT_RELEASE", "MT");
         cfg.define("LLVM_USE_CRT_RELWITHDEBINFO", "MT");
+        cfg.static_crt(true);
     }
 
     if target.starts_with("i686") {

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ pub fn llvm(build: &Build, target: &str) {`
`108`	`108`	`cfg.define("LLVM_USE_CRT_DEBUG", "MT");`
`109`	`109`	`cfg.define("LLVM_USE_CRT_RELEASE", "MT");`
`110`	`110`	`cfg.define("LLVM_USE_CRT_RELWITHDEBINFO", "MT");`
	`111`	`+ cfg.static_crt(true);`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`if target.starts_with("i686") {`