diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 13:15:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:20 +0100 |
| commit | b1d8d2a3bfe40d83a651448bcd0eeb01434b7ad1 (patch) | |
| tree | 8266c80e68acab46fed9e1831149100c31e50a84 /meta/recipes-devtools/rust/rust.inc | |
| parent | 9a093d034889bff444a5801313e24c39a323d7ef (diff) | |
| download | poky-b1d8d2a3bfe40d83a651448bcd0eeb01434b7ad1.tar.gz | |
rust: Generate per recipe target configuration files
Instead of generating target configuration files centrally and often getting
it wrong, or having trouble finding the right set, generate them dynamically
from the bbclass into WORKDIR per recipe.
(From OE-Core rev: 9160e4a37561d8ac882057450a818621bec13bed)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust/rust.inc')
| -rw-r--r-- | meta/recipes-devtools/rust/rust.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 7d1f5347ea..172cd22657 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc | |||
| @@ -12,9 +12,6 @@ DEPENDS:append:class-native = " rust-llvm-native" | |||
| 12 | 12 | ||
| 13 | S = "${RUSTSRC}" | 13 | S = "${RUSTSRC}" |
| 14 | 14 | ||
| 15 | # We generate local targets, and need to be able to locate them | ||
| 16 | export RUST_TARGET_PATH="${WORKDIR}/targets/" | ||
| 17 | |||
| 18 | export FORCE_CRATE_HASH="${BB_TASKHASH}" | 15 | export FORCE_CRATE_HASH="${BB_TASKHASH}" |
| 19 | 16 | ||
| 20 | RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" | 17 | RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" |
| @@ -40,6 +37,8 @@ setup_cargo_environment () { | |||
| 40 | 37 | ||
| 41 | inherit rust-target-config | 38 | inherit rust-target-config |
| 42 | 39 | ||
| 40 | RUST_TARGETGENS = "BUILD HOST TARGET" | ||
| 41 | |||
| 43 | do_rust_setup_snapshot () { | 42 | do_rust_setup_snapshot () { |
| 44 | for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do | 43 | for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do |
| 45 | "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig | 44 | "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig |
