commit:     30c03290412865070625b88ce46d8358b02da56f
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 09:47:09 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 09:47:09 2025 +0000
URL:        https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=30c03290

Add patches for Rust 1.84.1-r2

Patches:
- 1.78.0-musl-dynamic-linking.patch
- 1.83.0-cross-compile-libz.patch
- 1.67.0-doc-wasm.patch
- 1.84.1-fix-cross.patch

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 1.84.1-fix-cross.patch | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/1.84.1-fix-cross.patch b/1.84.1-fix-cross.patch
new file mode 100644
index 0000000..47d7766
--- /dev/null
+++ b/1.84.1-fix-cross.patch
@@ -0,0 +1,30 @@
+https://github.com/rust-lang/rust/issues/133629
+https://github.com/rust-lang/rust/commit/a24d859f19bbefe5371694f318568b0ab5a13299
+
+From: onur-ozkan <[email protected]>
+Date: Thu, 30 Jan 2025 16:51:08 +0000
+Subject: [PATCH] set rustc dylib on manually constructed rustc command
+
+Signed-off-by: onur-ozkan <[email protected]>
+--- a/src/bootstrap/src/core/builder/cargo.rs
++++ b/src/bootstrap/src/core/builder/cargo.rs
+@@ -653,7 +653,10 @@ impl Builder<'_> {
+                 // Build proc macros both for the host and the target unless 
proc-macros are not
+                 // supported by the target.
+                 if target != compiler.host && cmd_kind != Kind::Check {
+-                    let error = command(self.rustc(compiler))
++                    let mut rustc_cmd = command(self.rustc(compiler));
++                    self.add_rustc_lib_path(compiler, &mut rustc_cmd);
++
++                    let error = rustc_cmd
+                         .arg("--target")
+                         .arg(target.rustc_target_arg())
+                         .arg("--print=file-names")
+@@ -661,6 +664,7 @@ impl Builder<'_> {
+                         .arg("-")
+                         .run_capture(self)
+                         .stderr();
++
+                     let not_supported = error
+                         .lines()
+                         .any(|line| line.contains("unsupported crate type 
`proc-macro`"));

Reply via email to