From: Alexander Kanavin <alex.kana...@gmail.com>
cargo_do_compile runs only if the recipe is built using cargo
as the top level tool. Some recipes hide usage of cargo inside setuptools
(or autoconf) and use do_compile definitions specific to those,
and so the environment isn't properly set up.
This was exposed by latest versions of python3-cryptography.
(From OE-Core rev: a1946efdbec608d47f9e992c1b5cf3c671a204fc)
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
(cherry picked from commit 9f4ff643a028d7f5670d80861f2ce19ca2d90faa)
Signed-off-by: Steve Sakoman <st...@sakoman.com>
Signed-off-by: Scott Murray <scott.mur...@konsulko.com>
---
classes/cargo.bbclass | 1 -
classes/cargo_common.bbclass | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass
index 7a8cc1e..3ef0bbb 100644
--- a/classes/cargo.bbclass
+++ b/classes/cargo.bbclass
@@ -55,7 +55,6 @@ oe_cargo_build () {
do_compile[progress] = "outof:\s+(\d+)/(\d+)"
cargo_do_compile () {
- oe_cargo_fix_env
oe_cargo_build
}
diff --git a/classes/cargo_common.bbclass b/classes/cargo_common.bbclass
index 82ab25b..1ca0be4 100644
--- a/classes/cargo_common.bbclass
+++ b/classes/cargo_common.bbclass
@@ -149,6 +149,10 @@ python cargo_common_do_patch_paths() {
}
do_configure[postfuncs] += "cargo_common_do_patch_paths"
+do_compile:prepend () {
+ oe_cargo_fix_env
+}
+
oe_cargo_fix_env () {
export CC="${RUST_TARGET_CC}"
export CXX="${RUST_TARGET_CXX}"
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#60864): https://lists.yoctoproject.org/g/yocto/message/60864
Mute This Topic: https://lists.yoctoproject.org/mt/100921018/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
