mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 15:32:12 +02:00
72e21bef1a
Rust stable version updated to 1.83.0. https://blog.rust-lang.org/2024/11/28/Rust-1.83.0.html Renamed and modified the below patch to adapt the new version. rv32-cargo-rustix-0.38.34-fix.patch->rv32-cargo-rustix-0.38.37-fix.patch Modified the below patches to adapt the new version. repro-issue-fix-with-cc-crate-hashmap.patch revert-link-std-statically-in-rustc_driver-feature.patch Dropped: zlib-off64_t.patcha566e156b3kq Because of the following commit ,68034f837awhen we enable lib32, getting build failure because there is a check for target support for "-Zdual-proc-macros" flag not functioning properly when lib32 is enabled in the build environment. So for now reverting this commit and bring back the previous behavior, where the "-Zdual-proc-macros" flag is always added for building proc macros, regardless of the target architecture's support. This would bypass the check introduced in the patch, allowing the build to proceed without error, even when building for a 64-bit architecture with lib32 enabled. (From OE-Core rev: 40d8dafdf556d7ce79c12a6de872193be9a0928a) Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
44 lines
2.1 KiB
Diff
44 lines
2.1 KiB
Diff
rust: Fix build failure for v1.83 when lib32 enabled
|
|
|
|
Because of the following commit ,
|
|
https://github.com/rust-lang/rust/commit/68034f837a39387e49fc7d7c5b088f5372a1127e
|
|
when we enable lib32, getting build failure because there is a check for target
|
|
support for "-Zdual-proc-macros" flag not functioning properly when lib32 is
|
|
enabled in the build environment. So for now reverting this commit and bring
|
|
back the previous behavior, where the "-Zdual-proc-macros" flag is always
|
|
added for building proc macros, regardless of the target architecture's support.
|
|
This would bypass the check introduced in the patch, allowing the build to
|
|
proceed without error, even when building for a 64-bit architecture with lib32 enabled.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
|
|
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
|
|
index 9ac0b0a01f..b1374042fb 100644
|
|
--- a/src/bootstrap/src/core/builder.rs
|
|
+++ b/src/bootstrap/src/core/builder.rs
|
|
@@ -1701,21 +1701,8 @@ impl<'a> Builder<'a> {
|
|
// 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))
|
|
- .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");
|
|
}
|
|
}
|
|
}
|