Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8ebb539ce1df389350ab90407099c4def7510236

commit 8ebb539ce1df389350ab90407099c4def7510236
Author: Melko <me...@frugalware.org>
Date:   Tue Nov 1 12:31:33 2011 +0100

makepkg: fix ccache path inside chroot

diff --git a/scripts/makepkg b/scripts/makepkg
index 9eade65..2d90d68 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1551,11 +1551,16 @@ fi

# use ccache if it's available
if [ "$NOCCACHE" = "0" -a -d /usr/lib/ccache/bin ]; then
-       if [ -w $CCACHE_BASEDIR ]; then
+       if [ "$CHROOT" = "1" ]; then
+               CCACHE_REALDIR=/var/cache/ccache
+       else
+               CCACHE_REALDIR=$CCACHE_BASEDIR
+       fi
+       if [ -w $CCACHE_REALDIR ]; then
export PATH=/usr/lib/ccache/bin:$PATH
FCC="ccache $FCC"
-               install -d -m 2775 $CCACHE_BASEDIR/$pkgname
-               export CCACHE_DIR=$CCACHE_BASEDIR/$pkgname
+               install -d -m 2775 $CCACHE_REALDIR/$pkgname
+               export CCACHE_DIR=$CCACHE_REALDIR/$pkgname
export CCACHE_NOLINK=1
export CCACHE_UMASK=002
else
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to