bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #49759 - ollie27:rustbuild_cargo, r=Mark-Simulacrum

Browse source 
rustbuild: Fix setting initial cargo

Fixes #49741

r? @Mark-Simulacrum
This commit is contained in:
bors 2018-04-08 16:44:22 +00:00
commit 7327d9d0e2
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/config.rs
View file

@ -563,7 +563,7 @@ impl Config {
// default values for all options that we haven't otherwise stored yet.
set(&mut config.initial_rustc, build.rustc.map(PathBuf::from));
set(&mut config.initial_rustc, build.cargo.map(PathBuf::from));
set(&mut config.initial_cargo, build.cargo.map(PathBuf::from));
let default = false;
config.llvm_assertions = llvm_assertions.unwrap_or(default);