summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bergin <peter@berginkonsult.se>2022-06-29 10:06:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-08 08:27:16 +0100
commitb2dba5ca25a74c5bcc2307c685e9b519fa446afb (patch)
tree1a7cc002f0ff9b7110aa16e8446d84d9e139364b
parenta224001daa15fc84f62bc01e6e72232938a3c2a0 (diff)
downloadpoky-b2dba5ca25a74c5bcc2307c685e9b519fa446afb.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: dc179854b7ac9e19c9fcdb45ac74c6fdeefbe289) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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)