diff options
-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.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust.inc | 2 |
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" | |||
5 | HOST_SYS = "${HOST_ARCH}-unknown-linux-gnu" | 5 | HOST_SYS = "${HOST_ARCH}-unknown-linux-gnu" |
6 | CARGO_RUST_TARGET_CCLD = "${RUST_BUILD_CCLD}" | 6 | CARGO_RUST_TARGET_CCLD = "${RUST_BUILD_CCLD}" |
7 | 7 | ||
8 | require recipes-devtools/rust/rust-common.inc | 8 | inherit rust-target-config |
9 | require cargo.inc | 9 | require cargo.inc |
10 | 10 | ||
11 | CARGO = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo" | 11 | CARGO = "${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 | ||
42 | include rust-common.inc | 42 | inherit rust-target-config |
43 | 43 | ||
44 | do_rust_setup_snapshot () { | 44 | do_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 |