diff options
| author | bors <bors@rust-lang.org> | 2018-04-08 16:44:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-08 16:44:22 +0000 |
| commit | 7327d9d0e2345f9ed90e12f3edf2bc01d3dc31c7 (patch) | |
| tree | 21ecd8cbead0bb42bfa9aab820691b4da937e562 | |
| parent | 5f50718225365f6b891e148387d7fd2f2fa41831 (diff) | |
| parent | ccc049d54797522bf694b834b4a4848251e8e40d (diff) | |
| download | rust-7327d9d0e2345f9ed90e12f3edf2bc01d3dc31c7.tar.gz rust-7327d9d0e2345f9ed90e12f3edf2bc01d3dc31c7.zip | |
Auto merge of #49759 - ollie27:rustbuild_cargo, r=Mark-Simulacrum
rustbuild: Fix setting initial cargo Fixes #49741 r? @Mark-Simulacrum
| -rw-r--r-- | src/bootstrap/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 863abd14935..95baf4f8cca 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -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); |
