From cd9526df7306b3a5b43d521a721bbd039a99cdfd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 31 Mar 2023 07:26:31 +0200 Subject: rust: do not run separate build/install steps Upstream does not actually use or test it this way; if the goal is to install items, then install target should be executed directly. In particular, in latest rust release building stage 2 items has regressed altogether (incorrect dependencies between rust-analyze tool and the libs it needs) and no one noticed. (From OE-Core rev: 7d805f9a9f6b5048308a37a2757d08cca40b1ff3) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust_1.67.1.bb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.67.1.bb b/meta/recipes-devtools/rust/rust_1.67.1.bb index f4c6d9511d..eecb05ae02 100644 --- a/meta/recipes-devtools/rust/rust_1.67.1.bb +++ b/meta/recipes-devtools/rust/rust_1.67.1.bb @@ -221,17 +221,6 @@ FILES:${PN} += "${libdir}/*.so" FILES:${PN}-dev = "" do_compile () { - rust_runx build --stage 2 -} - -do_compile:append:class-target () { - rust_runx build --stage 2 src/tools/clippy - rust_runx build --stage 2 src/tools/rustfmt -} - -do_compile:append:class-nativesdk () { - rust_runx build --stage 2 src/tools/clippy - rust_runx build --stage 2 src/tools/rustfmt } ALLOW_EMPTY:${PN} = "1" @@ -256,6 +245,8 @@ rust_do_install() { rust_do_install:class-nativesdk() { export PSEUDO_UNLOAD=1 rust_runx install + rust_runx install clippy + rust_runx install rustfmt unset PSEUDO_UNLOAD install -d ${D}${bindir} @@ -274,6 +265,8 @@ EXTRA_TOOLS ?= "cargo-clippy clippy-driver rustfmt" rust_do_install:class-target() { export PSEUDO_UNLOAD=1 rust_runx install + rust_runx install clippy + rust_runx install rustfmt unset PSEUDO_UNLOAD install -d ${D}${bindir} -- cgit v1.2.3-54-g00ecf