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

Move buildflags check and build_options definition to scripts/libmakepkg/buildenv.sh.in.

Browse source
This commit is contained in:
loqs 2024-01-17 19:36:58 +00:00
parent 28be625a3e
commit 6b3d2487f9
No known key found for this signature in database
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
declare -a buildenv_functions buildenv_vars build_options declare -a buildenv_functions buildenv_vars build_options
buildenv_vars_exported=('LDFLAGS' 'MAKEFLAGS' 'CHOST') buildenv_vars_exported=('LDFLAGS' 'MAKEFLAGS' 'CHOST')
build_options+=('buildflags')
for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
source "$lib" source "$lib"
@ -47,8 +48,9 @@ check_append_debug_flags() {
} }
prepare_buildenv() { prepare_buildenv() {
# ensure this function runs first if check_option "buildflags" "n"; then
buildenv_buildflags unset ${buildenv_vars_exported[@]}
fi
for func in ${buildenv_functions[@]}; do for func in ${buildenv_functions[@]}; do
$func $func

6
scripts/libmakepkg/buildenv/buildflags.sh.in
View file

@ -25,10 +25,6 @@ MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
source "$MAKEPKG_LIBRARY/util/option.sh" source "$MAKEPKG_LIBRARY/util/option.sh"
build_options+=('buildflags')
buildenv_buildflags() { buildenv_buildflags() {
if check_option "buildflags" "n"; then :
unset ${buildenv_vars_exported[@]}
fi
} }