From e115fe54720ddcf9dcb8a3de2ea9e720abc6774f Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 16 Dec 2022 12:06:31 +0000 Subject: rust: Install target.json for target rustc As part of the merging builds, installation of target.json was lost causing `rustc` to fail on startup with: error: Error loading target specification: Could not find specification for target "aarch64-poky-linux-gnu". Run `rustc --print target-list` for a list of built-in targets We know the full target specification, so just install it directly rather than using the glob approach from previously. Fixes: b9b0cd99cdc7 ("rust: Enable nativesdk and target builds + replace rust-tools-cross-canadian") (From OE-Core rev: b187185ceecf1c852b1fdc47451d157a41962d69) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust_1.65.0.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/recipes-devtools/rust') diff --git a/meta/recipes-devtools/rust/rust_1.65.0.bb b/meta/recipes-devtools/rust/rust_1.65.0.bb index dbf74cec8f..b39f772c5f 100644 --- a/meta/recipes-devtools/rust/rust_1.65.0.bb +++ b/meta/recipes-devtools/rust/rust_1.65.0.bb @@ -68,6 +68,9 @@ rust_do_install:class-target() { chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i done + install -d ${D}${libdir}/rustlib/${RUST_HOST_SYS} + install -m 0644 ${WORKDIR}/rust-targets/${RUST_HOST_SYS}.json ${D}${libdir}/rustlib/${RUST_HOST_SYS}/target.json + chown root:root ${D}/ -R rm ${D}${libdir}/rustlib/uninstall.sh rm ${D}${libdir}/rustlib/install.log -- cgit v1.2.3-54-g00ecf