summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-23 22:19:01 +0200
committerDan McGee <dan@archlinux.org>2011-06-24 04:35:52 +0200
commitaa89a65a83bbac5487fff377cd6ac969e1796542 (patch)
tree23457e4e360ef52dc2bcca1dbef922280ee1cd83
parent54ef162a1a9e27e362732d873f0739bc0a2cf1bf (diff)
downloadpacman-aa89a65a83bbac5487fff377cd6ac969e1796542.tar.gz
pacman-aa89a65a83bbac5487fff377cd6ac969e1796542.tar.xz
makepkg: remove distcc/makeflags option interaction
Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in3
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 239bb642..cd94ac98 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -822,9 +822,6 @@ run_build() {
if [[ $(check_buildenv distcc) = "y" && $(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=""
fi
# use ccache if it is requested (check buildenv and PKGBUILD opts)