From ec51c22e902c2556438f1323a71a5e47ef00681e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 17 Oct 2025 14:27:16 +0100 Subject: [PATCH] libstd-rs: remove redundant CARGO_TARGET_DIR The cargo class already sets this, so there's no need to set it again. The value set by cargo.bbclass is actually ${B}/target, so update the do_install task to match. (From OE-Core rev: 3557f1c294531e7f8c34a2b0677e8c03f1b1be77) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/libstd-rs_1.90.0.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/rust/libstd-rs_1.90.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.90.0.bb index b39ec0ab39..8af93bec57 100644 --- a/meta/recipes-devtools/rust/libstd-rs_1.90.0.bb +++ b/meta/recipes-devtools/rust/libstd-rs_1.90.0.bb @@ -34,7 +34,6 @@ CARGO_BUILD_FLAGS += "--features '${CARGO_FEATURES}'" CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" do_compile:prepend () { - export CARGO_TARGET_DIR="${B}" # For Rust 1.13.0 and newer export RUSTC_BOOTSTRAP="1" } @@ -45,8 +44,8 @@ do_install () { # With the incremental build support added in 1.24, the libstd deps directory also includes dependency # files that get installed. Those are really only needed to incrementally rebuild the libstd library # itself and don't need to be installed. - rm -f ${B}/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/*.d - cp ${B}/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/* ${D}${rustlibdir} + rm -f ${B}/target/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/*.d + cp ${B}/target/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/* ${D}${rustlibdir} } BBCLASSEXTEND = "nativesdk" -- 2.47.3