summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-05-16 17:14:19 +0000
committerDan McGee <dan@archlinux.org>2007-05-16 17:14:19 +0000
commit6a0059ddd5e96617adf4200ad1f9f74545031c85 (patch)
treebe4aff7290b35abc40538c1836a1ae1380f0ad9f /scripts
parent2c74e0ad8a426ad58ebaa1a71ba76918d3734cb5 (diff)
downloadpacman-6a0059ddd5e96617adf4200ad1f9f74545031c85.tar.xz
Ensure MAKEFLAGS and DISTCC_HOSTS are exported if required
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/makepkg10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/makepkg b/scripts/makepkg
index 3ff28ee3..c192855f 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -862,9 +862,10 @@ else
# use distcc if it is requested (check buildenv and PKGBUILD opts)
if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then
[ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH
+ export DISTCC_HOSTS
elif [ "$(check_option distcc)" = "n" ]; then
# if it is not wanted, clear the makeflags too
- export MAKEFLAGS=""
+ MAKEFLAGS=""
fi
# use ccache if it is requested (check buildenv and PKGBUILD opts)
@@ -874,7 +875,7 @@ else
# clear user-specified makeflags if requested
if [ "$(check_option makeflags)" = "n" ]; then
- export MAKEFLAGS=""
+ MAKEFLAGS=""
fi
# build
@@ -884,9 +885,8 @@ else
unset LC_ALL LC_MESSAGES LANG
umask 0022
- # ensure CFLAGS and CXXFLAGS are used
- export CFLAGS
- export CXXFLAGS
+ # ensure all necessary build variables are exported
+ export CFLAGS CXXFLAGS MAKEFLAGS
#check for "exit on syntax error" shell option
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null