diff options
| author | bors <bors@rust-lang.org> | 2017-06-16 12:18:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-16 12:18:45 +0000 |
| commit | ebbc9ea914a1cefa48afb9cc6c9f7a14ff7c6857 (patch) | |
| tree | 413f80bfbaed58d39b32d9cc5856393da0a67e92 /src/bootstrap | |
| parent | 787d9da1253da6351dd8edbef4aef23c3f26f475 (diff) | |
| parent | 406eddf5e1e14b9356b332c0df987a1bdf0d2c7f (diff) | |
| download | rust-ebbc9ea914a1cefa48afb9cc6c9f7a14ff7c6857.tar.gz rust-ebbc9ea914a1cefa48afb9cc6c9f7a14ff7c6857.zip | |
Auto merge of #42410 - nagisa:llvmup, r=sanxiyn
Upgrade LLVM Includes https://github.com/rust-lang/llvm/pull/80
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/check.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 2a1b27334c3..0d3cc2e0b1b 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -245,6 +245,9 @@ pub fn compiletest(build: &Build, let llvm_config = build.llvm_config(target); let llvm_version = output(Command::new(&llvm_config).arg("--version")); cmd.arg("--llvm-version").arg(llvm_version); + if !build.is_rust_llvm(target) { + cmd.arg("--system-llvm"); + } cmd.args(&build.flags.cmd.test_args()); |