RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abuild: only set up ccache in rootbld when USE_CCACHE is set 

avoid install ccache and bind mount ~/.ccache when USE_CCACHE is not
set.

This fixes bind mount error when ~/.ccache is missing and USE_CCACHE is
unset.
This commit is contained in:
Natanael Copa 2019-10-01 12:49:49 +00:00
parent b1b47140ea
commit 3ca7660b66
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
abuild.in
View File

@ -2176,7 +2176,8 @@ rootbld() {
calcdeps
$SUDO_APK add --initdb --root "$BUILD_ROOT" --update \
abuild alpine-base build-base git ccache $hostdeps $builddeps
abuild alpine-base build-base git $hostdeps $builddeps \
${USE_CCACHE:+ccache}
local bwrap_opts=""
options_has "net" || bwrap_opts="$bwrap_opts --unshare-net"
@ -2187,7 +2188,7 @@ rootbld() {
--bind "$BUILD_ROOT/$HOME" "$HOME" \
--ro-bind "$HOME/.abuild" "$HOME/.abuild" \
--ro-bind "$aportsgit" "$aportsgit" \
--bind "$HOME/.ccache" "$HOME/.ccache" \
${USE_CCACHE:+ --bind "$HOME/.ccache" "$HOME/.ccache"} \
--bind "$SRCDEST" "$SRCDEST" \
--bind "$BUILD_ROOT/tmp" /tmp \
--bind "$BUILD_ROOT/tmp/src" "$srcdir" \