From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Tue, 21 Jan 2025 09:43:33 +0000 (+0100)
Subject: bootstrap: revert cross-build breaking change
X-Git-Tag: archive/raspbian/1.85.0+dfsg2-2+rpi1~6^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=267ebbd29c62cf7568fb9959fc7549dabe542797;p=rustc.git

bootstrap: revert cross-build breaking change

this reverts 68034f837a39387e49fc7d7c5b088f5372a1127e modulo file split that
happened afterwards.

Forwarded: https://github.com/rust-lang/rust/issues/133629

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

Gbp-Pq: Topic bootstrap
Gbp-Pq: Name bootstrap-revert-cross-build-breaking-change.patch
---

diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 55e4cc4cc7..47ab244f39 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -657,24 +657,10 @@ impl Builder<'_> {
         match mode {
             Mode::Std | Mode::ToolBootstrap | Mode::ToolStd => {}
             Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {
-                // Build proc macros both for the host and the target unless proc-macros are not
-                // supported by the target.
+                // Build proc macros both for the host and the target
                 if target != compiler.host && cmd_kind != Kind::Check {
-                    let error = command(self.rustc(compiler))
-                        .arg("--target")
-                        .arg(target.rustc_target_arg())
-                        .arg("--print=file-names")
-                        .arg("--crate-type=proc-macro")
-                        .arg("-")
-                        .run_capture(self)
-                        .stderr();
-                    let not_supported = error
-                        .lines()
-                        .any(|line| line.contains("unsupported crate type `proc-macro`"));
-                    if !not_supported {
-                        cargo.arg("-Zdual-proc-macros");
-                        rustflags.arg("-Zdual-proc-macros");
-                    }
+                    cargo.arg("-Zdual-proc-macros");
+                    rustflags.arg("-Zdual-proc-macros");
                 }
             }
         }