From d6b563710e6cc0857843433d85023d47f9f2037d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 10 Oct 2021 21:10:08 +0200 Subject: rust: generate target definitions from (arch, abi), not just arch This allows to add the missing x32 definition and others in the future. (From OE-Core rev: 79bd6389585327820dfc1a1d29f60779ef08b2e0) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust-cross.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/rust/rust-cross.inc') diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc index bee7c9f12f..42163f7b81 100644 --- a/meta/recipes-devtools/rust/rust-cross.inc +++ b/meta/recipes-devtools/rust/rust-cross.inc @@ -11,13 +11,15 @@ python do_rust_gen_targets () { features = "" cpu = "generic" arch = d.getVar('{}_ARCH'.format(thing)) + abi = "" if thing is "TARGET": + abi = d.getVar('ABIEXTENSION') # arm and armv7 have different targets in llvm if arch == "arm" and target_is_armv7(d): arch = 'armv7' features = d.getVar('TARGET_LLVM_FEATURES') or "" cpu = d.getVar('TARGET_LLVM_CPU') - rust_gen_target(d, thing, wd, features, cpu, arch) + rust_gen_target(d, thing, wd, features, cpu, arch, abi) } # Otherwise we'll depend on what we provide -- cgit v1.2.3-54-g00ecf