From 01825891d13b8c5d7868e36add5e5cf1e89b5818 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 20 Apr 2024 11:37:54 +1000 Subject: [PATCH] libmakepkg: do not unset CHOST with !buildflags Also ensure CHOST and MAKEFLAGS are exported. Signed-off-by: Allan McRae (cherry picked from commit 7dcf9a2b49226af8fcb43202d83260873fc11490) --- scripts/libmakepkg/buildenv.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index 331da3c8..50006b59 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -25,7 +25,7 @@ LIBMAKEPKG_BUILDENV_SH=1 MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} declare -a buildenv_functions build_options -buildenv_vars=('CPPFLAGS' 'CFLAGS' 'CXXFLAGS' 'LDFLAGS' 'CHOST') +buildenv_vars=('CPPFLAGS' 'CFLAGS' 'CXXFLAGS' 'LDFLAGS') for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do source "$lib" @@ -42,5 +42,5 @@ prepare_buildenv() { done # ensure all necessary build variables are exported - export ${buildenv_vars[@]} + export ${buildenv_vars[@]} CHOST MAKEFLAGS }