From 3ca7660b664f6e9e95031976781ebcd1435a6ce2 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 1 Oct 2019 12:49:49 +0000 Subject: [PATCH] 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. --- abuild.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/abuild.in b/abuild.in index 9250411..7a919fd 100644 --- a/abuild.in +++ b/abuild.in @@ -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" \