mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libstd-rs: remove redundant CARGO_TARGET_DIR

Browse Source 
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)

(From OE-Core rev: ec51c22e902c2556438f1323a71a5e47ef00681e)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2025-10-17 14:27:16 +01:00
committed by Richard Purdie
parent 416731b875
commit b466b11964
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-devtools/rust/libstd-rs_1.90.0.bb
View File

@@ -34,7 +34,6 @@ CARGO_BUILD_FLAGS += "--features '${CARGO_FEATURES}'"
CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
do_compile:prepend () { do_compile:prepend () {
export CARGO_TARGET_DIR="${B}"
# For Rust 1.13.0 and newer # For Rust 1.13.0 and newer
export RUSTC_BOOTSTRAP="1" 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 # 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 # files that get installed. Those are really only needed to incrementally rebuild the libstd library
# itself and don't need to be installed. # itself and don't need to be installed.
rm -f ${B}/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/*.d rm -f ${B}/target/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/*.d
cp ${B}/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/* ${D}${rustlibdir} cp ${B}/target/${RUST_TARGET_SYS}/${BUILD_DIR}/deps/* ${D}${rustlibdir}
} }
BBCLASSEXTEND = "nativesdk" BBCLASSEXTEND = "nativesdk"