From e821a0670cfb4e4a94738d917fcfcda6c1425624 Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Sun, 22 Feb 2026 21:54:40 -0500 Subject: [PATCH] fix(linux-6.12.74): keep host tools on /usr/bin and avoid cross ld contamination --- steps-guix/linux-6.12.74/pass1.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/steps-guix/linux-6.12.74/pass1.sh b/steps-guix/linux-6.12.74/pass1.sh index d9aa9388..e2555c69 100644 --- a/steps-guix/linux-6.12.74/pass1.sh +++ b/steps-guix/linux-6.12.74/pass1.sh @@ -6,7 +6,12 @@ : "${KERNEL_TARGET:=x86_64-unknown-linux-musl}" kernel_env() { - export PATH="${KERNEL_SYSROOT}/bin:${PATH}" + # Keep host tools on the host toolchain; target tools come from CROSS_COMPILE. + export PATH="/usr/bin:/bin" + export HOSTCC="gcc" + export HOSTCXX="g++" + export HOSTLD="ld" + export HOSTAR="ar" export HOSTCFLAGS="-I${KERNEL_SYSROOT}/include" export HOSTLDFLAGS="-L${KERNEL_SYSROOT}/lib" export LD_LIBRARY_PATH="${KERNEL_SYSROOT}/lib:${LD_LIBRARY_PATH}"