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

Ensure MAKEFLAGS and DISTCC_HOSTS are exported if required

Browse source
This commit is contained in:
Dan McGee 2007-05-16 17:14:19 +00:00
parent 2c74e0ad8a
commit 6a0059ddd5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/makepkg
View file

@ -862,9 +862,10 @@ else
# use distcc if it is requested (check buildenv and PKGBUILD opts) # use distcc if it is requested (check buildenv and PKGBUILD opts)
if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then
[ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH
export DISTCC_HOSTS
elif [ "$(check_option distcc)" = "n" ]; then elif [ "$(check_option distcc)" = "n" ]; then
# if it is not wanted, clear the makeflags too # if it is not wanted, clear the makeflags too
export MAKEFLAGS="" MAKEFLAGS=""
fi fi
# use ccache if it is requested (check buildenv and PKGBUILD opts) # use ccache if it is requested (check buildenv and PKGBUILD opts)
@ -874,7 +875,7 @@ else
# clear user-specified makeflags if requested # clear user-specified makeflags if requested
if [ "$(check_option makeflags)" = "n" ]; then if [ "$(check_option makeflags)" = "n" ]; then
export MAKEFLAGS="" MAKEFLAGS=""
fi fi
# build # build
@ -884,9 +885,8 @@ else
unset LC_ALL LC_MESSAGES LANG unset LC_ALL LC_MESSAGES LANG
umask 0022 umask 0022
# ensure CFLAGS and CXXFLAGS are used # ensure all necessary build variables are exported
export CFLAGS export CFLAGS CXXFLAGS MAKEFLAGS
export CXXFLAGS
#check for "exit on syntax error" shell option #check for "exit on syntax error" shell option
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null echo $SHELLOPTS | grep errexit 2>&1 >/dev/null