From 5c9f0206dc09d88b039a0c700578ba78b356782a Mon Sep 17 00:00:00 2001 From: Deepesh Varatharajan Date: Tue, 4 Mar 2025 22:01:57 -0800 Subject: [PATCH] rust: Fix build break because of download-ci-llvm Previously, download-ci-llvm was set to false. However, with the following commit: https://github.com/rust-lang/rust/commit/7d579046c80d3de3143dcb8b2db5640f95b5383c , which has been present from rust_1.83, it was changed to true. As a result, after updating to rust_1.83, we encountered the following error during the build: ------------------------------------------------------------------------------- | thread 'main' panicked at src/core/config/config.rs:2047:13: | setting build-target.llvm-config is incompatible with download-ci-llvm. | note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ------------------------------------------------------------------------------- To resolve this issue, we are setting download-ci-llvm back to false. (From OE-Core rev: d43424cba7e93ee30b410d0a024be441e2336dbd) Signed-off-by: Deepesh Varatharajan Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust_1.83.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb index c4f8ee7108..cd470b1883 100644 --- a/meta/recipes-devtools/rust/rust_1.83.0.bb +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb @@ -129,6 +129,7 @@ python do_configure() { # [llvm] config.add_section("llvm") config.set("llvm", "static-libstdcpp", e(False)) + config.set("llvm", "download-ci-llvm", e(False)) if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""): config.set("llvm", "use-libcxx", e(True))