[08/29] rust-common: Rework wrappers top handle musl

Message ID	20220805131252.3706794-8-richard.purdie@linuxfoundation.org
State	New
Headers	show Return-Path: <richard.purdie@linuxfoundation.org> ip: 209.85.128.42, mailfrom: richard.purdie@linuxfoundation.org) From: Richard Purdie <richard.purdie@linuxfoundation.org> To: openembedded-core@lists.openembedded.org Subject: [PATCH 08/29] rust-common: Rework wrappers top handle musl Date: Fri, 5 Aug 2022 14:12:31 +0100 Message-Id: <20220805131252.3706794-8-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

Message ID

20220805131252.3706794-8-richard.purdie@linuxfoundation.org

State

New

Headers

From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/29] rust-common: Rework wrappers top handle musl
Date: Fri,  5 Aug 2022 14:12:31 +0100
Message-Id: <20220805131252.3706794-8-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

Commit Message

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

For musl we need to be able to add a library to the end of the linker commandline.
Rework the wrapper code to be able to do this through a new variable.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/rust-common.bbclass | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index b79a829462c..1bce7761ab0 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -141,13 +141,18 @@  RUST_TARGET_AR = "${WRAPPER_DIR}/target-rust-ar"
 create_wrapper () {
 	file="$1"
 	shift
+	extras="$1"
+	shift
 
 	cat <<- EOF > "${file}"
 	#!/usr/bin/env python3
 	import os, sys
 	orig_binary = "$@"
+	extras = "${extras}"
 	binary = orig_binary.split()[0]
 	args = orig_binary.split() + sys.argv[1:]
+	if extras:
+	    args.append(extras)
 	os.execvp(binary, args)
 	EOF
 	chmod +x "${file}"
@@ -157,6 +162,7 @@  WRAPPER_TARGET_CC = "${CC}"
 WRAPPER_TARGET_CXX = "${CXX}"
 WRAPPER_TARGET_CCLD = "${CCLD}"
 WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}"
+WRAPPER_TARGET_EXTRALD = ""
 WRAPPER_TARGET_AR = "${AR}"
 
 # compiler is used by gcc-rs
@@ -166,22 +172,22 @@  do_rust_create_wrappers () {
 	mkdir -p "${WRAPPER_DIR}"
 
 	# Yocto Build / Rust Host C compiler
-	create_wrapper "${RUST_BUILD_CC}" "${BUILD_CC}"
+	create_wrapper "${RUST_BUILD_CC}" "" "${BUILD_CC}"
 	# Yocto Build / Rust Host C++ compiler
-	create_wrapper "${RUST_BUILD_CXX}" "${BUILD_CXX}"
+	create_wrapper "${RUST_BUILD_CXX}" "" "${BUILD_CXX}"
 	# Yocto Build / Rust Host linker
-	create_wrapper "${RUST_BUILD_CCLD}" "${BUILD_CCLD}" "${BUILD_LDFLAGS}"
+	create_wrapper "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}"
 	# Yocto Build / Rust Host archiver
-	create_wrapper "${RUST_BUILD_AR}" "${BUILD_AR}"
+	create_wrapper "${RUST_BUILD_AR}" "" "${BUILD_AR}"
 
 	# Yocto Target / Rust Target C compiler
-	create_wrapper "${RUST_TARGET_CC}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}"
+	create_wrapper "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}"
 	# Yocto Target / Rust Target C++ compiler
-	create_wrapper "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}"
+	create_wrapper "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}"
 	# Yocto Target / Rust Target linker
-	create_wrapper "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}"
+	create_wrapper "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}"
 	# Yocto Target / Rust Target archiver
-	create_wrapper "${RUST_TARGET_AR}" "${WRAPPER_TARGET_AR}"
+	create_wrapper "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}"
 
 }

[08/29] rust-common: Rework wrappers top handle musl

Commit Message

Patch