From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 18 Sep 2021 10:45:21 +0000 (+0100)
Subject: u-8d504aa90416668d8f6b4cbd449e2e1de20fb937
X-Git-Tag: archive/raspbian/1.59.0+dfsg1-1_deb11u3+rpi1~2^2^2^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8c4453713ba752b8a2cca2d22d200ab1889f6329;p=rustc-mozilla.git

u-8d504aa90416668d8f6b4cbd449e2e1de20fb937

commit 8d504aa90416668d8f6b4cbd449e2e1de20fb937
Bug: https://github.com/rust-lang/rust/issues/84057
Author: Ximin Luo <infinity0@pwned.gg>
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
---

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index a31c87d43..df4ef5d39 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -417,11 +417,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")