moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 08:18:51 -05:00
Code Issues Releases Wiki Activity

makepkg: ensure DISTCC_HOSTS variable is exported when required

Browse Source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-05-16 13:18:19 -04:00
parent 53f2dcaa3a
commit c88037203b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/makepkg.in
View File

@ -397,6 +397,7 @@ run_build() {
# 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
MAKEFLAGS="" MAKEFLAGS=""
@ -418,10 +419,8 @@ run_build() {
# ensure we have a sane umask set # ensure we have a sane umask set
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
export MAKEFLAGS
# check for "exit on syntax error" shell option # check for "exit on syntax error" shell option
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null; set_e=$? echo $SHELLOPTS | grep errexit 2>&1 >/dev/null; set_e=$?