moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

makepkg: Correctly layer distcc and ccache

Browse Source 
ccache expects further compiler wrappers to be specified via
CCACHE_PREFIX. Otherwise, ccache will hash the wrapper executable
instead of the real one.

Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jan Alexander Steffens (heftig) 2015-09-15 22:17:03 +02:00 committed by Allan McRae
parent 70e6875ad9
commit 2627b423ff
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/makepkg.sh.in
View File

@ -851,15 +851,22 @@ run_prepare() {
}
run_build() {
# use distcc if it is requested (check buildenv and PKGBUILD opts)
if check_buildoption "distcc" "y"; then
[[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH"
export DISTCC_HOSTS
fi
local ccache=0
# use ccache if it is requested (check buildenv and PKGBUILD opts)
if check_buildoption "ccache" "y"; then
[[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH"
if check_buildoption "ccache" "y" && [[ -d /usr/lib/ccache/bin ]]; then
export PATH="/usr/lib/ccache/bin:$PATH"
ccache=1
fi
# use distcc if it is requested (check buildenv and PKGBUILD opts)
if check_buildoption "distcc" "y"; then
if (( ccache )); then
export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc"
elif [[ -d /usr/lib/distcc/bin ]]; then
export PATH="/usr/lib/distcc/bin:$PATH"
fi
export DISTCC_HOSTS
fi
run_function_safe "build"