summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cargo/cargo-cross-canadian.inc7
-rw-r--r--meta/recipes-devtools/rust/rust-cross-canadian-common.inc8
-rw-r--r--meta/recipes-devtools/rust/rust-cross.inc8
3 files changed, 3 insertions, 20 deletions
diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
index e83b6a67b3..a2fac929d4 100644
--- a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
+++ b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
@@ -28,12 +28,7 @@ inherit cross-canadian
28 28
29PN = "cargo-cross-canadian-${TRANSLATED_TARGET_ARCH}" 29PN = "cargo-cross-canadian-${TRANSLATED_TARGET_ARCH}"
30 30
31python do_rust_gen_targets () { 31RUST_TARGETGENS = "BUILD HOST"
32 wd = d.getVar('WORKDIR') + '/targets/'
33
34 rust_gen_target(d, 'BUILD', wd, d.getVar('BUILD_ARCH'))
35 rust_gen_target(d, 'HOST', wd, d.getVar('HOST_ARCH'))
36}
37 32
38do_compile:prepend () { 33do_compile:prepend () {
39 PKG_CONFIG_PATH="${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig:${PKG_CONFIG_PATH}" 34 PKG_CONFIG_PATH="${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc
index 5c0644e92d..34020ff6ff 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc
@@ -25,13 +25,7 @@ DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDP
25 -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ 25 -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
26 " 26 "
27 27
28python do_rust_gen_targets () { 28RUST_TARGETGENS = "BUILD HOST TARGET"
29 wd = d.getVar('WORKDIR') + '/targets/'
30 # Order of BUILD, HOST, TARGET is important in case the files overwrite, most specific last
31 rust_gen_target(d, 'BUILD', wd, d.getVar('BUILD_ARCH'))
32 rust_gen_target(d, 'HOST', wd, d.getVar('HOST_ARCH'))
33 rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_ARCH'))
34}
35 29
36INHIBIT_DEFAULT_RUST_DEPS = "1" 30INHIBIT_DEFAULT_RUST_DEPS = "1"
37 31
diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc
index 719857ebbb..ab538e6659 100644
--- a/meta/recipes-devtools/rust/rust-cross.inc
+++ b/meta/recipes-devtools/rust/rust-cross.inc
@@ -1,10 +1,4 @@
1python do_rust_gen_targets () { 1RUST_TARGETGENS = "BUILD HOST TARGET"
2 wd = d.getVar('WORKDIR') + '/targets/'
3 # Order of BUILD, HOST, TARGET is important in case the files overwrite, most specific last
4 rust_gen_target(d, 'BUILD', wd, d.getVar('BUILD_ARCH'))
5 rust_gen_target(d, 'HOST', wd, d.getVar('HOST_ARCH'))
6 rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_ARCH'))
7}
8 2
9# Otherwise we'll depend on what we provide 3# Otherwise we'll depend on what we provide
10INHIBIT_DEFAULT_RUST_DEPS = "1" 4INHIBIT_DEFAULT_RUST_DEPS = "1"