bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'distcc_ccache' into 'master'

Browse source 
Fix distcc when used with ccache

See merge request pacman/pacman!117
This commit is contained in:
Angelo Dal Zotto 2025-01-17 04:52:03 +00:00
commit fcaf54bfca
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/libmakepkg/buildenv/compiler.sh.in
View file

@ -43,13 +43,11 @@ buildenv_ccache() {
buildenv_distcc() { buildenv_distcc() {
if check_buildoption "distcc" "y"; then if check_buildoption "distcc" "y"; then
if (( using_ccache )); then if [[ -d /usr/lib/distcc/bin ]]; 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
export PATH="/usr/lib/distcc/bin:$PATH" export PATH="/usr/lib/distcc/bin:$PATH"
if (( using_ccache )); then
export CCACHE_BASEDIR="$srcdir"
fi
fi fi
export DISTCC_HOSTS export DISTCC_HOSTS