summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-05-16 19:18:19 +0200
committerDan McGee <dan@archlinux.org>2007-05-16 19:18:19 +0200
commitc88037203b37bf5488f281618ff08442dd7261df (patch)
treef6ced35de7fcf49d1d0ae778f304f6287ac94815
parent53f2dcaa3aabaeb251706f2e61cd151cf06a2d07 (diff)
downloadpacman-c88037203b37bf5488f281618ff08442dd7261df.tar.gz
pacman-c88037203b37bf5488f281618ff08442dd7261df.tar.xz
makepkg: ensure DISTCC_HOSTS variable is exported when required
Signed-off-by: Dan McGee <dan@archlinux.org>
-rwxr-xr-xscripts/makepkg.in7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index 024adcd1..c9316646 100755
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -397,6 +397,7 @@ run_build() {
# 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
MAKEFLAGS=""
@@ -418,10 +419,8 @@ run_build() {
# ensure we have a sane umask set
umask 0022
- # ensure CFLAGS and CXXFLAGS are used
- export CFLAGS
- export CXXFLAGS
- export MAKEFLAGS
+ # 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; set_e=$?