From 713937f4cdd56136e1c7587248c5de90e1b84827 Mon Sep 17 00:00:00 2001 From: Angelo Elias Dal Zotto Date: Sat, 3 Feb 2024 09:46:25 -0300 Subject: [PATCH] Fix distcc when used with ccache --- scripts/libmakepkg/buildenv/compiler.sh.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in index 46794f13..2c95ba24 100644 --- a/scripts/libmakepkg/buildenv/compiler.sh.in +++ b/scripts/libmakepkg/buildenv/compiler.sh.in @@ -43,13 +43,11 @@ buildenv_ccache() { buildenv_distcc() { if check_buildoption "distcc" "y"; then - if (( using_ccache )); then - if [[ " $CCACHE_PREFIX " != *" distcc "* ]]; then - export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" - fi - export CCACHE_BASEDIR="$srcdir" - elif [[ -d /usr/lib/distcc/bin ]]; then + if [[ -d /usr/lib/distcc/bin ]]; then export PATH="/usr/lib/distcc/bin:$PATH" + if (( using_ccache )); then + export CCACHE_BASEDIR="$srcdir" + fi fi export DISTCC_HOSTS