summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPeter Bergin <peter@berginkonsult.se>2022-06-29 08:06:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-29 15:16:56 (GMT)
commit701ac97c156adb67b367a90adbfeb29cb3019b67 (patch)
tree0ff2bbb7b474a22f265a1bc414c273a9d516cfd1 /meta/recipes-devtools
parent95f8fe68ee69dbca5d4b2c07cd601cbaf596065d (diff)
downloadpoky-master.tar.gz
rust: fix issue building cross-canadian tools for aarch64 on x86_64HEADmaster
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.inc5
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 621cd4a..ef70c48 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)