diff options
author | Peter Bergin <peter@berginkonsult.se> | 2022-06-29 10:06:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-29 16:16:56 +0100 |
commit | 701ac97c156adb67b367a90adbfeb29cb3019b67 (patch) | |
tree | 0ff2bbb7b474a22f265a1bc414c273a9d516cfd1 /meta/recipes-devtools | |
parent | 95f8fe68ee69dbca5d4b2c07cd601cbaf596065d (diff) | |
download | poky-701ac97c156adb67b367a90adbfeb29cb3019b67.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>
(From OE-Core rev: ef566af964e9f9d2c440a3b5771ed801216f30f9)
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>
Diffstat (limited to 'meta/recipes-devtools')
-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=""): | |||
309 | 309 | ||
310 | # build tspec | 310 | # build tspec |
311 | tspec = {} | 311 | tspec = {} |
312 | if bb.data.inherits_class('cross-canadian', d): | 312 | tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) |
313 | tspec['llvm-target'] = d.getVar('RUST_HOST_SYS', arch_abi) | ||
314 | else: | ||
315 | tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) | ||
316 | tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi) | 313 | tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi) |
317 | tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi)) | 314 | tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi)) |
318 | tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) | 315 | tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) |