From 419b54a9f2044578a3f828162f1fc21737aad4cf Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sun, 26 Sep 2021 03:25:38 +0100 Subject: [PATCH] u-8d504aa90416668d8f6b4cbd449e2e1de20fb937 commit 8d504aa90416668d8f6b4cbd449e2e1de20fb937 Bug: https://github.com/rust-lang/rust/issues/84057 Author: Ximin Luo Date: Sun Apr 11 13:47:58 2021 +0100 bootstrap: check local_rebuild before adding --cfg=bootstrap, closes #84057 Gbp-Pq: Name u-8d504aa90416668d8f6b4cbd449e2e1de20fb937.patch --- src/bootstrap/compile.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 65a2d210a..4273238a2 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -438,11 +438,14 @@ impl Step for StartupObjects { let dst_file = &dst_dir.join(file.to_string() + ".o"); if !up_to_date(src_file, dst_file) { let mut cmd = Command::new(&builder.initial_rustc); + cmd.env("RUSTC_BOOTSTRAP", "1"); + if !builder.local_rebuild { + // a local_rebuild compiler already has stage1 features + cmd.arg("--cfg") + .arg("bootstrap"); + } builder.run( - cmd.env("RUSTC_BOOTSTRAP", "1") - .arg("--cfg") - .arg("bootstrap") - .arg("--target") + cmd.arg("--target") .arg(target.rustc_target_arg()) .arg("--emit=obj") .arg("-o") -- 2.30.2