Skip to content

Commit

Permalink
Auto merge of rust-lang#70320 - Keruspe:1.43.0-rebuild, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

[beta] 1.43: don't pass -Zconfig-profile to cargo when self rebuilding

This option is now stable thus our cargo will reject it

Fixes rust-lang#69975
  • Loading branch information
bors committed Mar 25, 2020
2 parents 1eaaee9 + cd935cb commit 4c587bb
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,11 @@ impl<'a> Builder<'a> {
self.clear_if_dirty(&my_out, &rustdoc);
}

cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd).arg("-Zconfig-profile");
cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd);

if !self.local_rebuild {
cargo.arg("-Zconfig-profile");
}

let profile_var = |name: &str| {
let profile = if self.config.rust_optimize { "RELEASE" } else { "DEV" };
Expand Down

0 comments on commit 4c587bb

Please sign in to comment.