Skip to content

Commit 4c587bb

Browse files
committed
Auto merge of #70320 - Keruspe:1.43.0-rebuild, r=Mark-Simulacrum
[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 #69975
2 parents 1eaaee9 + cd935cb commit 4c587bb

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/bootstrap/builder.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,11 @@ impl<'a> Builder<'a> {
725725
self.clear_if_dirty(&my_out, &rustdoc);
726726
}
727727

728-
cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd).arg("-Zconfig-profile");
728+
cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd);
729+
730+
if !self.local_rebuild {
731+
cargo.arg("-Zconfig-profile");
732+
}
729733

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

0 commit comments

Comments
 (0)