proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-02-01 22:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert upstream commit breaking cross builds

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2025-01-21 10:44:50 +01:00
parent 1e264b9f9a
commit 44adb4926e
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
debian/patches/bootstrap/bootstrap-revert-cross-build-breaking-change.patch vendored Normal file
View File

@ -0,0 +1,49 @@
From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Tue, 21 Jan 2025 10:43:33 +0100
Subject: bootstrap: revert cross-build breaking change
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
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>
---
src/bootstrap/src/core/builder/cargo.rs | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 0e53660..e76bcb2 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -655,24 +655,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");
}
}
}

1
debian/patches/series vendored
View File

@ -47,3 +47,4 @@ build/ci_rustc-disable-test-that-requires-upstream-git-repo.patch
build/bootstrap-don-t-attempt-to-download-rustc-in-tests.patch
behaviour/proc-macro-srv-make-usage-of-RTLD_DEEPBIND-portable.patch
upstream/fix-hurd-build-stat64.st_fsid-was-renamed-to-st_dev.patch
bootstrap/bootstrap-revert-cross-build-breaking-change.patch