[pacman-dev] CVS update of pacman-lib/scripts (makepkg)

[Dan McGee]

    Date: Wednesday, May 16, 2007 @ 13:14:19
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.72 -> 1.73)

Ensure MAKEFLAGS and DISTCC_HOSTS are exported if required


---------+
 makepkg |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.72 pacman-lib/scripts/makepkg:1.73
--- pacman-lib/scripts/makepkg:1.72	Sat Apr 28 04:26:37 2007
+++ pacman-lib/scripts/makepkg	Wed May 16 13:14:19 2007
@@ -862,9 +862,10 @@
 	# 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 @@
 
 	# clear user-specified makeflags if requested
 	if [ "$(check_option makeflags)" = "n" ]; then
-		export MAKEFLAGS=""
+		MAKEFLAGS=""
 	fi
 
 	# build
@@ -884,9 +885,8 @@
 	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