diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 13:39:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:20 +0100 |
commit | 251f55374d26b5c24d8833aa87c95432be8b81b2 (patch) | |
tree | d83905b2963e8604ea754d85d1176d2fef417ab3 /meta/recipes-devtools/cargo/cargo.inc | |
parent | cdd65a42a8b7c23d3640d341c84e747dfb96d269 (diff) | |
download | poky-251f55374d26b5c24d8833aa87c95432be8b81b2.tar.gz |
cargo: Drop cross-canadian variant and fix/use nativesdk
The cargo-cross-candian variant made no sense as one version of cargo in
the SDK can work for all targets. Replace it with nativesdk-cargo instead.
Move the SDK env to rust-cross-canadian.
(From OE-Core rev: 6d6d135924eff5993736ee58ba8cc5d00ca635f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cargo/cargo.inc')
-rw-r--r-- | meta/recipes-devtools/cargo/cargo.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cargo/cargo.inc b/meta/recipes-devtools/cargo/cargo.inc index 978504052b..e34554a9d7 100644 --- a/meta/recipes-devtools/cargo/cargo.inc +++ b/meta/recipes-devtools/cargo/cargo.inc | |||
@@ -56,3 +56,8 @@ export LIBSSH2_SYS_USE_PKG_CONFIG = "1" | |||
56 | # so we must use the locally set up snapshot to bootstrap the build. | 56 | # so we must use the locally set up snapshot to bootstrap the build. |
57 | BASEDEPENDS:remove:class-native = "cargo-native" | 57 | BASEDEPENDS:remove:class-native = "cargo-native" |
58 | CARGO:class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo" | 58 | CARGO:class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo" |
59 | |||
60 | DEPENDS:append:class-nativesdk = " nativesdk-rust" | ||
61 | RUSTLIB:append:class-nativesdk = " -L ${STAGING_DIR_HOST}/${SDKPATHNATIVE}/usr/lib/rustlib/${RUST_HOST_SYS}/lib" | ||
62 | |||
63 | |||