mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 23:02:22 +02:00
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 <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3f0acc2a61
commit
cd9526df73
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user