Skip to content

Commit ddfc20b

Browse files
committed
Pass static crt to llvm cmake configuration
1 parent 0728b71 commit ddfc20b

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

src/Cargo.lock

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ test = false
2525

2626
[dependencies]
2727
build_helper = { path = "../build_helper" }
28-
cmake = "0.1.17"
28+
cmake = "0.1.23"
2929
filetime = "0.1"
3030
num_cpus = "0.2"
3131
toml = "0.1"
3232
getopts = "0.2"
3333
rustc-serialize = "0.3"
34-
gcc = "0.3.38"
34+
gcc = "0.3.46"
3535
libc = "0.2"

src/bootstrap/native.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ pub fn llvm(build: &Build, target: &str) {
9696
.define("LLVM_ENABLE_LIBEDIT", "OFF")
9797
.define("LLVM_PARALLEL_COMPILE_JOBS", build.jobs().to_string())
9898
.define("LLVM_TARGET_ARCH", target.split('-').next().unwrap())
99-
.define("LLVM_DEFAULT_TARGET_TRIPLE", target);
99+
.define("LLVM_DEFAULT_TARGET_TRIPLE", target)
100+
.static_crt(true);
100101

101102
if target.starts_with("i686") {
102103
cfg.define("LLVM_BUILD_32_BITS", "ON");

0 commit comments

Comments
 (0)