diff mbox series

[20/29] rust-common: Update to match cross targets

Message ID	20220805131252.3706794-20-richard.purdie@linuxfoundation.org
State	Accepted, archived
Commit	dc134c031171a55a35964ba801219552a516a0ca
Headers	show Return-Path: <richard.purdie@linuxfoundation.org> ip: 209.85.221.43, mailfrom: richard.purdie@linuxfoundation.org) From: Richard Purdie <richard.purdie@linuxfoundation.org> To: openembedded-core@lists.openembedded.org Subject: [PATCH 20/29] rust-common: Update to match cross targets Date: Fri, 5 Aug 2022 14:12:43 +0100 Message-Id: <20220805131252.3706794-20-richard.purdie@linuxfoundation.org> In-Reply-To: <20220805131252.3706794-1-richard.purdie@linuxfoundation.org> References: <20220805131252.3706794-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/29] nativesdk: Clear TUNE_FEATURES \| expand [01/29] nativesdk: Clear TUNE_FEATURES [02/29] populate_sdk_base: Disable rust SDK for MIPS n32 [03/29] selftest/reproducible: Exclude rust/rust-dbg for now until we can fix [04/29] conf/distro/no-static-libs: Allow static musl for rust [05/29] rust-target-config: Add mips n32 best guess at target information [06/29] rust-common: Add CXXFLAGS [07/29] rust-common: Drop export directive from wrappers [08/29] rust-common: Rework wrappers top handle musl [09/29] rust: Work around reproducibility issues [10/29] rust: Switch to use RUST_XXX_SYS consistently [11/29] rust.inc: Rename variables to make code clearer [12/29] rust.inc: Fix cross build llvm-config handling [13/29] rust/mesa: Drop obsolete YOCTO_ALTERNATE_MULTILIB_NAME [14/29] rust-target-config: Show clear error when target isn't defined [15/29] rust: Generate per recipe target configuration files [16/29] rust-common/rust: Improve bootstrap BUILD_SYS handling [17/29] cargo_common: Handle build SYS as well as HOST/TARGET [18/29] rust-llvm: Enable nativesdk variant [19/29] rust.inc: Fix for cross compilation configuration [20/29] rust-common: Update to match cross targets [21/29] rust-target-config: Make target workaround generic [22/29] rust-common: Simplify libc handling [23/29] cargo: Drop cross-canadian variant and fix/use nativesdk [24/29] rust-common: Set rustlibdir to match target expectation [25/29] rust-cross-canadian: Simplify and fix [26/29] rust: Drop cross/crosssdk [27/29] rust: Enable nativesdk and target builds + replace rust-tools-cross-canadian [28/29] rust: Fix musl builds [29/29] rust: Ensure buildpaths are handled in debug symbols correctly

Commit Message

Richard Purdie Aug. 5, 2022, 1:12 p.m. UTC

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>
---
 meta/classes/rust-common.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

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)))