summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/rust-target-config.bbclass (renamed from meta/recipes-devtools/rust/rust-common.inc)1
-rw-r--r--meta/recipes-devtools/cargo/cargo-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/rust/rust.inc2
3 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/classes/rust-target-config.bbclass
index 2edc71e0d3..4db91d36d5 100644
--- a/meta/recipes-devtools/rust/rust-common.inc
+++ b/meta/classes/rust-target-config.bbclass
@@ -1,4 +1,3 @@
1
2# Right now this is focused on arm-specific tune features. 1# Right now this is focused on arm-specific tune features.
3# We get away with this for now as one can only use x86-64 as the build host 2# We get away with this for now as one can only use x86-64 as the build host
4# (not arm). 3# (not arm).
diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
index d12267db3d..e83b6a67b3 100644
--- a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
+++ b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
@@ -5,7 +5,7 @@ RUST_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config"
5HOST_SYS = "${HOST_ARCH}-unknown-linux-gnu" 5HOST_SYS = "${HOST_ARCH}-unknown-linux-gnu"
6CARGO_RUST_TARGET_CCLD = "${RUST_BUILD_CCLD}" 6CARGO_RUST_TARGET_CCLD = "${RUST_BUILD_CCLD}"
7 7
8require recipes-devtools/rust/rust-common.inc 8inherit rust-target-config
9require cargo.inc 9require cargo.inc
10 10
11CARGO = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo" 11CARGO = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index ea716d31f2..ecb057ad3b 100644
--- a/meta/recipes-devtools/rust/rust.inc
+++ b/meta/recipes-devtools/rust/rust.inc
@@ -39,7 +39,7 @@ setup_cargo_environment () {
39 printf "linker = '%s'\n" "${RUST_BUILD_CCLD}" >> ${CARGO_HOME}/config 39 printf "linker = '%s'\n" "${RUST_BUILD_CCLD}" >> ${CARGO_HOME}/config
40} 40}
41 41
42include rust-common.inc 42inherit rust-target-config
43 43
44do_rust_setup_snapshot () { 44do_rust_setup_snapshot () {
45 for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do 45 for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do