diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 13:53:53 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:20 +0100 |
| commit | 38934deeea87686982fb1536a2ccff4ae51781d5 (patch) | |
| tree | 8f76a52622604251af11fa9066024a7456309e4a /meta/classes | |
| parent | 0a01b5ab973ed6351fb485950adaf888f27f990d (diff) | |
| download | poky-38934deeea87686982fb1536a2ccff4ae51781d5.tar.gz | |
rust: Drop cross/crosssdk
Now that target config json is provided by rust-target-config.bbclass,
the need for the cross and crosssdk recipes is removed. Drop them and
simplify dependencies accordingly.
(From OE-Core rev: 4b54f5f52b33db4d2fe95c5faef033b6c6b37b7d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/cargo.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/rust.bbclass | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/cargo.bbclass b/meta/classes/cargo.bbclass index 2475d05b3d..4bfcfe5fc6 100644 --- a/meta/classes/cargo.bbclass +++ b/meta/classes/cargo.bbclass | |||
| @@ -13,8 +13,8 @@ CARGO = "cargo" | |||
| 13 | BASEDEPENDS:append = " cargo-native" | 13 | BASEDEPENDS:append = " cargo-native" |
| 14 | 14 | ||
| 15 | # Ensure we get the right rust variant | 15 | # Ensure we get the right rust variant |
| 16 | DEPENDS:append:class-target = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}" | 16 | DEPENDS:append:class-target = " rust-native ${RUSTLIB_DEP}" |
| 17 | DEPENDS:append:class-nativesdk = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}" | 17 | DEPENDS:append:class-nativesdk = " rust-native ${RUSTLIB_DEP}" |
| 18 | DEPENDS:append:class-native = " rust-native" | 18 | DEPENDS:append:class-native = " rust-native" |
| 19 | 19 | ||
| 20 | # Enable build separation | 20 | # Enable build separation |
diff --git a/meta/classes/rust.bbclass b/meta/classes/rust.bbclass index f20e063c5b..2639cecfd4 100644 --- a/meta/classes/rust.bbclass +++ b/meta/classes/rust.bbclass | |||
| @@ -10,7 +10,7 @@ def rust_base_dep(d): | |||
| 10 | deps = "" | 10 | deps = "" |
| 11 | if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS'): | 11 | if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS'): |
| 12 | if (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')): | 12 | if (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')): |
| 13 | deps += " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}" | 13 | deps += " rust-native ${RUSTLIB_DEP}" |
| 14 | else: | 14 | else: |
| 15 | deps += " rust-native" | 15 | deps += " rust-native" |
| 16 | return deps | 16 | return deps |
