From eb447549313d3783054dff5efaf30e65dc15cb99 Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Thu, 19 Mar 2026 21:35:53 -0400 Subject: [PATCH] fix(linux-6.12.74): Pass env vars to make as args instead of exporting --- steps-guix/linux-6.12.74/pass1.sh | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/steps-guix/linux-6.12.74/pass1.sh b/steps-guix/linux-6.12.74/pass1.sh index 75f4f65d..93d57f86 100644 --- a/steps-guix/linux-6.12.74/pass1.sh +++ b/steps-guix/linux-6.12.74/pass1.sh @@ -3,21 +3,16 @@ : "${KERNEL_SYSROOT:=/kernel-toolchain}" : "${KERNEL_TARGET:=x86_64-unknown-linux-musl}" -kernel_env() { - # 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}" -} - kernel_make() { - kernel_env make "${MAKEJOBS}" \ + PATH="/usr/bin:/bin" \ + HOSTCC="gcc" \ + HOSTCXX="g++" \ + HOSTLD="ld" \ + HOSTAR="ar" \ + HOSTCFLAGS="-I${KERNEL_SYSROOT}/include" \ + HOSTLDFLAGS="-L${KERNEL_SYSROOT}/lib" \ + LD_LIBRARY_PATH="${KERNEL_SYSROOT}/lib:${LD_LIBRARY_PATH}" \ ARCH=x86_64 \ CROSS_COMPILE="${KERNEL_SYSROOT}/bin/${KERNEL_TARGET}-" \ "$@"