bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libmakepkg: do not unset CHOST with !buildflags

Browse source 
Also ensure CHOST and MAKEFLAGS are exported.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2024-04-20 11:37:54 +10:00
parent 4dc21b965b
commit 7dcf9a2b49
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/libmakepkg/buildenv.sh.in
View file

@ -25,7 +25,7 @@ LIBMAKEPKG_BUILDENV_SH=1
MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
declare -a buildenv_functions build_options 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 for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
source "$lib" source "$lib"
@ -42,5 +42,5 @@ prepare_buildenv() {
done done
# ensure all necessary build variables are exported # ensure all necessary build variables are exported
export ${buildenv_vars[@]} export ${buildenv_vars[@]} CHOST MAKEFLAGS
} }