From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 5 Aug 2022 13:04:04 +0000 (+0100)
Subject: rust-common: Update to match cross targets
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3412
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc134c031171a55a35964ba801219552a516a0ca;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rust-common: Update to match cross targets

Tweak the armv7 workaround to work for cross environments and as a host
triplet and not just as a target.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index f2e99493fef..7c432ed131b 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -63,7 +63,7 @@ def rust_base_triple(d, thing):
     '''
 
     # The llvm-target for armv7 is armv7-unknown-linux-gnueabihf
-    if thing == "TARGET" and target_is_armv7(d):
+    if d.getVar('{}_ARCH'.format(thing)) == d.getVar('TARGET_ARCH') and target_is_armv7(d):
         arch = "armv7"
     else:
         arch = oe.rust.arch_to_rust_arch(d.getVar('{}_ARCH'.format(thing)))