Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9454972

Browse files
committedMay 12, 2017
Update Cargo.lock and set static_crt only if target contains "msvc"
1 parent 4f6f5e6 commit 9454972

File tree

2 files changed

+425
-84
lines changed

2 files changed

+425
-84
lines changed
 

‎src/Cargo.lock

+423-82
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bootstrap/native.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ pub fn llvm(build: &Build, target: &str) {
102102
.define("LLVM_ENABLE_LIBEDIT", "OFF")
103103
.define("LLVM_PARALLEL_COMPILE_JOBS", build.jobs().to_string())
104104
.define("LLVM_TARGET_ARCH", target.split('-').next().unwrap())
105-
.define("LLVM_DEFAULT_TARGET_TRIPLE", target)
106-
.static_crt(true);
105+
.define("LLVM_DEFAULT_TARGET_TRIPLE", target);
107106

108107
if target.contains("msvc") {
109108
cfg.define("LLVM_USE_CRT_DEBUG", "MT");
110109
cfg.define("LLVM_USE_CRT_RELEASE", "MT");
111110
cfg.define("LLVM_USE_CRT_RELWITHDEBINFO", "MT");
111+
cfg.static_crt(true);
112112
}
113113

114114
if target.starts_with("i686") {

0 commit comments

Comments
 (0)
Please sign in to comment.