gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-16 14:29:05 -07:00
Code Issues Projects Releases Wiki Activity

cargo.eclass: Build with --target for non-native multilib ABIs

Browse Source 
Ebuilds were having to explicitly pass --target to work around this.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
2025-12-20 08:56:30 +00:00
parent a03373648b
commit 94de850364
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
eclass/cargo.eclass
View File

@@ -453,13 +453,22 @@ _cargo_gen_git_config() {
fi
}
# @FUNCTION: _cargo_needs_target
# @INTERNAL
# @DESCRIPTION:
# Cargo does not apply flags to the build host when --target is given, even if
# it is the native target, so only pass it when actually needed.
_cargo_needs_target() {
tc-is-cross-compiler || { has multilib-build ${INHERITED} && ! multilib_is_native_abi; }
}
# @FUNCTION: cargo_target_dir
# @DESCRIPTION:
# Return the directory within target that contains the build, e.g.
# target/aarch64-unknown-linux-gnu/release.
cargo_target_dir() {
local abi
tc-is-cross-compiler && abi=/$(rust_abi)
_cargo_needs_target && abi=/$(rust_abi)
echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)"
}
@@ -776,7 +785,7 @@ cargo_env() {
# Only tell Cargo to cross-compile when actually needed to avoid the
# aforementioned build host vs target flag separation issue.
tc-is-cross-compiler || unset CARGO_BUILD_TARGET
_cargo_needs_target || unset CARGO_BUILD_TARGET
"${@}"
)