Merge pull request #1600 from pullmoll/master

xbps-src: unified ccache directory
2015-05-18 20:29:05 +02:00 · 2015-05-18 20:29:05 +02:00 · 420ed45147
parent 7844735e83 b1af6a413e
commit 420ed45147
1 changed files with 4 additions and 1 deletions
--- a/5
+++ b/5
@ -536,7 +536,10 @@ else
    export PATH="$MYPATH"
    if [ -n "$XBPS_CCACHE" ]; then
        CCACHEPATH="/usr/lib/ccache/bin"
-        export CCACHE_DIR="$XBPS_HOSTDIR/ccache-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
+        export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
+        # Avoid not using cached files just due to compiler mtime
+        # changes when e.g. bootstrapping
+        export CCACHE_COMPILERCHECK=content
        export PATH="$CCACHEPATH:$PATH"
        mkdir -p $CCACHE_DIR
    fi