diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-03-31 07:26:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-04-04 13:11:49 +0100 |
commit | cd9526df7306b3a5b43d521a721bbd039a99cdfd (patch) | |
tree | 57a3b88e04ec4151f7265f65d0bde99654ea42f8 /meta/recipes-devtools/rust | |
parent | 3f0acc2a6133bf8cd3cb2c5046cf6f7e8943283c (diff) | |
download | poky-cd9526df7306b3a5b43d521a721bbd039a99cdfd.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/rust')
-rw-r--r-- | meta/recipes-devtools/rust/rust_1.67.1.bb | 15 |
1 files 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" | |||
221 | FILES:${PN}-dev = "" | 221 | FILES:${PN}-dev = "" |
222 | 222 | ||
223 | do_compile () { | 223 | do_compile () { |
224 | rust_runx build --stage 2 | ||
225 | } | ||
226 | |||
227 | do_compile:append:class-target () { | ||
228 | rust_runx build --stage 2 src/tools/clippy | ||
229 | rust_runx build --stage 2 src/tools/rustfmt | ||
230 | } | ||
231 | |||
232 | do_compile:append:class-nativesdk () { | ||
233 | rust_runx build --stage 2 src/tools/clippy | ||
234 | rust_runx build --stage 2 src/tools/rustfmt | ||
235 | } | 224 | } |
236 | 225 | ||
237 | ALLOW_EMPTY:${PN} = "1" | 226 | ALLOW_EMPTY:${PN} = "1" |
@@ -256,6 +245,8 @@ rust_do_install() { | |||
256 | rust_do_install:class-nativesdk() { | 245 | rust_do_install:class-nativesdk() { |
257 | export PSEUDO_UNLOAD=1 | 246 | export PSEUDO_UNLOAD=1 |
258 | rust_runx install | 247 | rust_runx install |
248 | rust_runx install clippy | ||
249 | rust_runx install rustfmt | ||
259 | unset PSEUDO_UNLOAD | 250 | unset PSEUDO_UNLOAD |
260 | 251 | ||
261 | install -d ${D}${bindir} | 252 | install -d ${D}${bindir} |
@@ -274,6 +265,8 @@ EXTRA_TOOLS ?= "cargo-clippy clippy-driver rustfmt" | |||
274 | rust_do_install:class-target() { | 265 | rust_do_install:class-target() { |
275 | export PSEUDO_UNLOAD=1 | 266 | export PSEUDO_UNLOAD=1 |
276 | rust_runx install | 267 | rust_runx install |
268 | rust_runx install clippy | ||
269 | rust_runx install rustfmt | ||
277 | unset PSEUDO_UNLOAD | 270 | unset PSEUDO_UNLOAD |
278 | 271 | ||
279 | install -d ${D}${bindir} | 272 | install -d ${D}${bindir} |