mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

rust-common: Rework wrappers to handle musl

Browse Source 
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.

(From OE-Core rev: dfff5a176765c0e8b212bf31081f80e79025fd1b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-08-05 12:01:32 +01:00
parent ae3950ec5a
commit b2ffb96705
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/rust-common.bbclass
+14 -8
View File
@@ -141,13 +141,18 @@ RUST_TARGET_AR = "${WRAPPER_DIR}/target-rust-ar"
create_wrapper () { create_wrapper () {
file="$1" file="$1"
shift shift
extras="$1"
shift
cat <<- EOF > "${file}" cat <<- EOF > "${file}"
#!/usr/bin/env python3 #!/usr/bin/env python3
import os, sys import os, sys
orig_binary = "$@" orig_binary = "$@"
extras = "${extras}"
binary = orig_binary.split()[0] binary = orig_binary.split()[0]
args = orig_binary.split() + sys.argv[1:] args = orig_binary.split() + sys.argv[1:]
if extras:
args.append(extras)
os.execvp(binary, args) os.execvp(binary, args)
EOF EOF
chmod +x "${file}" chmod +x "${file}"
@@ -157,6 +162,7 @@ WRAPPER_TARGET_CC = "${CC}"
WRAPPER_TARGET_CXX = "${CXX}" WRAPPER_TARGET_CXX = "${CXX}"
WRAPPER_TARGET_CCLD = "${CCLD}" WRAPPER_TARGET_CCLD = "${CCLD}"
WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}" WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}"
WRAPPER_TARGET_EXTRALD = ""
WRAPPER_TARGET_AR = "${AR}" WRAPPER_TARGET_AR = "${AR}"
# compiler is used by gcc-rs # compiler is used by gcc-rs
@@ -166,22 +172,22 @@ do_rust_create_wrappers () {
mkdir -p "${WRAPPER_DIR}" mkdir -p "${WRAPPER_DIR}"
# Yocto Build / Rust Host C compiler # 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 # 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 # 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 # 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 # 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 # 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 # 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 # Yocto Target / Rust Target archiver
create_wrapper "${RUST_TARGET_AR}" "${WRAPPER_TARGET_AR}" create_wrapper "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}"
} }