From daa9363b53190cce427c2d0e49448df67ce413e5 Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Tue, 15 Nov 2016 11:32:03 -0800 Subject: [PATCH] build: remove ccache dependency on host --- build/run | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/run b/build/run index b8f3964db..58b607c8c 100755 --- a/build/run +++ b/build/run @@ -85,6 +85,7 @@ if [ "`uname -s`" != "Linux" ]; then MOUNT_OPTS="${MOUNT_OPTS} \ -v ${container_volume}:${BUILDER_HOME}/go" + CCACHE_ARGS="-e CCACHE_DIR=${BUILDER_HOME}/go/.ccache -e CCACHE_LOG" else # On linux bind mounts are cheap so we dont need to rsync @@ -104,11 +105,10 @@ else -v ${scriptdir}/../.work/cross:${BUILDER_HOME}/go/.work \ -v ${scriptdir}/..:${BUILDER_HOME}/go/src/${source_repo}" - CCACHE_MOUNT_ARGS="-v ${CCACHE_DIR}:${BUILDER_HOME}/go/.ccache" -fi - -if [[ `which ccache` && -d "${CCACHE_DIR}" ]]; then - CCACHE_ARGS="-e CCACHE_DIR=${BUILDER_HOME}/go/.ccache -e CCACHE_LOG ${CCACHE_MOUNT_ARGS}" + if [[ -d "${CCACHE_DIR}" ]]; then + CCACHE_ARGS="-e CCACHE_DIR=${BUILDER_HOME}/go/.ccache -e CCACHE_LOG \ + -v ${CCACHE_DIR}:${BUILDER_HOME}/go/.ccache" + fi fi # we copy credential files for github access