From e4900a7e80af3647f76480af68b8f14962b9c4c8 Mon Sep 17 00:00:00 2001 From: jbu Date: Sat, 2 May 2015 17:09:37 +0200 Subject: [PATCH] xbps-src: Use CCACHE_PREFIX for ccache+distcc closes #1468 --- xbps-src | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xbps-src b/xbps-src index 31acbb3adea..46b97b8b472 100755 --- a/xbps-src +++ b/xbps-src @@ -535,10 +535,14 @@ else mkdir -p $CCACHE_DIR fi 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_HOSTS="$XBPS_DISTCC_HOSTS" - export PATH="$DISTCCPATH:$PATH" mkdir -p $DISTCC_DIR fi fi