diff options
| author | bors <bors@rust-lang.org> | 2017-06-30 22:14:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-30 22:14:56 +0000 |
| commit | 7d89b20669be33c2388ad97a3ee90fca4e5684ec (patch) | |
| tree | 50bb240425e428a1e8ea354e2997d582a03f66dd /src/bootstrap | |
| parent | 37849a002ed91ac2b80aeb2172364b4e19250e05 (diff) | |
| parent | bda06de5dc96c6c4af825286da1df6849a73254e (diff) | |
| download | rust-7d89b20669be33c2388ad97a3ee90fca4e5684ec.tar.gz rust-7d89b20669be33c2388ad97a3ee90fca4e5684ec.zip | |
Auto merge of #42995 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests - Successful merges: #42669, #42911, #42925, #42957, #42985, #42987 - Failed merges: #42936
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index c8ab3a8fc1d..b2bd792e93b 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -276,10 +276,6 @@ pub fn rustc(build: &Build, target: &str, compiler: &Compiler) { if build.is_rust_llvm(target) { cargo.env("LLVM_RUSTLLVM", "1"); } - if let Some(ref cfg_file) = build.flags.config { - let cfg_path = t!(PathBuf::from(cfg_file).canonicalize()); - cargo.env("CFG_LLVM_TOML", cfg_path.into_os_string()); - } cargo.env("LLVM_CONFIG", build.llvm_config(target)); let target_config = build.config.target_config.get(target); if let Some(s) = target_config.and_then(|c| c.llvm_config.as_ref()) { |