From: Peter Bergin Date: Wed, 29 Jun 2022 08:06:36 +0000 (+0200) Subject: rust: fix issue building cross-canadian tools for aarch64 on x86_64 X-Git-Tag: uninative-3.7~463 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef566af964e9f9d2c440a3b5771ed801216f30f9;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git 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 Signed-off-by: Peter Bergin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 621cd4ad576..ef70c48d0f4 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)