Detect ccache directory from ccache configuration.

2 files changed, 11 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14f65e9e0b40..9e1965ee0616 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bazel-git
 	pkgdesc = Correct, reproducible, and fast builds for everyone
-	pkgver = r24483.5e1847c23e
+	pkgver = r24502.9ec89b9194
 	pkgrel = 1
 	url = http://bazel.io/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index f05318f1616d..46118f89072c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kenneth Endfinger <kaendfinger@gmail.com>
 pkgname=bazel-git
-pkgver=r24501.ab6134b185
+pkgver=r24502.9ec89b9194
 pkgrel=1
 pkgdesc="Correct, reproducible, and fast builds for everyone"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -23,9 +23,16 @@ build() {
 
   EXTRA_BAZEL_ARGS=()
 
-  if [ -d "${HOME}/.ccache" ]
+  CCACHE_DIR="${HOME}/.ccache"
+
+  if command -v ccache > /dev/null
+  then
+    CCACHE_DIR="$(ccache -k cache_dir)"
+  fi
+
+  if [ -d "${CCACHE_DIR}" ]
   then
-    EXTRA_BAZEL_ARGS+=("--sandbox_writable_path" "${HOME}/.ccache")
+    EXTRA_BAZEL_ARGS+=("--sandbox_writable_path" "${CCACHE_DIR}")
   fi
 
   /opt/bazel-bootstrap/bin/bazel build //src:bazel scripts:bazel-complete.bash "${EXTRA_BAZEL_ARGS[@]}"