diff options
author | Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> | 2025-03-27 02:06:04 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-27 13:41:58 +0000 |
commit | 824f05fe73c23c49530eb37c6a4ddab09a9289ad (patch) | |
tree | 955ba288c2fe053abaed2e0492d709e261aeb01d | |
parent | 2cb5d1accca23df67dd55d01416ea404ab92683b (diff) | |
download | poky-824f05fe73c23c49530eb37c6a4ddab09a9289ad.tar.gz |
rust: Fix build break because of "download-rustc" and "llvm-tools"
>From Rust 1.84, the download-rustc and llvm-tools options were set to True
(previously they were False)
https://github.com/rust-lang/rust/commit/cce6f03754f096f8a2bdfb357e3739b855e29366
(download-rustc)
https://github.com/rust-lang/rust/commit/38f0c099b2e684ea689633eb424d8737a1063a5e
(llvm-tools)
For tarball sources, the download-rustc option should be False, so it has been
reverted back to False.
Setting llvm-tools to True caused issues with finding llvm-objcopy, so this
has been changed back to False.
Upstream-Status: https://github.com/rust-lang/rust/pull/134240/
(From OE-Core rev: 2eb952d839e72c24a4180a57631c77910a0da980)
Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rust/rust_1.83.0.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb index cd470b1883..ee8c782ce3 100644 --- a/meta/recipes-devtools/rust/rust_1.83.0.bb +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb | |||
@@ -137,6 +137,8 @@ python do_configure() { | |||
137 | config.add_section("rust") | 137 | config.add_section("rust") |
138 | config.set("rust", "rpath", e(True)) | 138 | config.set("rust", "rpath", e(True)) |
139 | config.set("rust", "remap-debuginfo", e(True)) | 139 | config.set("rust", "remap-debuginfo", e(True)) |
140 | config.set("rust", "download-rustc", e(False)) | ||
141 | config.set("rust", "llvm-tools", e(False)) | ||
140 | config.set("rust", "channel", e(d.expand("${RUST_CHANNEL}"))) | 142 | config.set("rust", "channel", e(d.expand("${RUST_CHANNEL}"))) |
141 | 143 | ||
142 | # Whether or not to optimize the compiler and standard library | 144 | # Whether or not to optimize the compiler and standard library |