Merge pull request #1485 from pullmoll/xbps-src

xbps-src: Use CCACHE_PREFIX for ccache+distcc
This commit is contained in:
Juan RP 2015-05-03 18:43:51 +02:00
commit 252a642f83

View file

@ -535,10 +535,14 @@ else
mkdir -p $CCACHE_DIR mkdir -p $CCACHE_DIR
fi fi
if [ -n "$XBPS_DISTCC" ]; then if [ -n "$XBPS_DISTCC" ]; then
DISTCCPATH="/usr/lib/distcc/bin" if [ -n "$XBPS_CCACHE" ]; then
export CCACHE_PREFIX="/usr/bin/distcc"
else
DISTCCPATH="/usr/lib/distcc/bin"
export PATH="$DISTCCPATH:$PATH"
fi
export DISTCC_DIR="$XBPS_HOSTDIR/distcc-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}" export DISTCC_DIR="$XBPS_HOSTDIR/distcc-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
export DISTCC_HOSTS="$XBPS_DISTCC_HOSTS" export DISTCC_HOSTS="$XBPS_DISTCC_HOSTS"
export PATH="$DISTCCPATH:$PATH"
mkdir -p $DISTCC_DIR mkdir -p $DISTCC_DIR
fi fi
fi fi