Skip to content

Commit

Permalink
Auto merge of rust-lang#49759 - ollie27:rustbuild_cargo, r=Mark-Simul…
Browse files Browse the repository at this point in the history
…acrum

rustbuild: Fix setting initial cargo

Fixes rust-lang#49741

r? @Mark-Simulacrum
  • Loading branch information
bors committed Apr 8, 2018
2 parents 5f50718 + ccc049d commit 7327d9d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7327d9d

Please sign in to comment.