Message ID | a3f566fcbfc02e0a3b3f6a676d6dde88a5b50506.1695248921.git.steve@sakoman.com |
---|---|
State | Accepted, archived |
Commit | a3f566fcbfc02e0a3b3f6a676d6dde88a5b50506 |
Headers | show |
Series | [kirkstone,01/20] go: Fix CVE-2023-39319 | expand |
diff --git a/meta/classes/cargo.bbclass b/meta/classes/cargo.bbclass index 4a780a501f..6df3b19b00 100644 --- a/meta/classes/cargo.bbclass +++ b/meta/classes/cargo.bbclass @@ -49,7 +49,6 @@ oe_cargo_build () { do_compile[progress] = "outof:\s+(\d+)/(\d+)" cargo_do_compile () { - oe_cargo_fix_env oe_cargo_build } diff --git a/meta/classes/cargo_common.bbclass b/meta/classes/cargo_common.bbclass index 1e9d284b5d..c1bc142d85 100644 --- a/meta/classes/cargo_common.bbclass +++ b/meta/classes/cargo_common.bbclass @@ -101,6 +101,10 @@ cargo_common_do_configure () { EOF } +do_compile:prepend () { + oe_cargo_fix_env +} + oe_cargo_fix_env () { export CC="${RUST_TARGET_CC}" export CXX="${RUST_TARGET_CXX}"