diff options
| author |   Peter Bergin <peter@berginkonsult.se> | 2022-06-29 10:06:36 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-07-01 06:23:58 -1000 |
| commit | dc179854b7ac9e19c9fcdb45ac74c6fdeefbe289 (patch) | |
| tree | 0d64d29d6b68a10075aa5b40016e1abb83b3981e | |
| parent | e52deac4f3a4fc7c064d9fc67bdae314efd329f1 (diff) | |
| download | openembedded-core-contrib-dc179854b7ac9e19c9fcdb45ac74c6fdeefbe289.tar.gz | |
rust: fix issue building cross-canadian tools for aarch64 on x86_64
Commit bd36593ba3db758b3eacc974e48468a665967961 did introduce a
regression when building package rust-cross-canadian-aarch64
on a x86_64 host. This commit will fix that configuration.
Suggested-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ef566af964e9f9d2c440a3b5771ed801216f30f9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-devtools/rust/rust-common.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 621cd4ad57..ef70c48d0f 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -309,10 +309,7 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): # build tspec tspec = {} - if bb.data.inherits_class('cross-canadian', d): - tspec['llvm-target'] = d.getVar('RUST_HOST_SYS', arch_abi) - else: - tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) + tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi) tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi)) tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) |