ccache: Include architecture in hashing

ccache was configured to neglegt the compiler it is using
which causes conflicts when using the same cache for compiling
multiple architectures. Hence we include the architecture
(and the toolchain version) in the hash so that a different
hash will be generated.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/make.sh b/make.sh
index 235964b4b90e4a482d9b0dea5666cb0123a27e26..85542009851f1aec21c192d53bc795f712677c84 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -236,7 +236,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_COMPILERCHECK="none"
+    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null

diff --git a/tools/make-functions b/tools/make-functions
index 68ae0a1de33c772fe8584c3e540e8302d6887ed8..a94dbd725ce0ea0f39c170a11ed240a732b914d3 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -456,8 +456,8 @@ entershell() {
                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
                CCACHE_DIR=/usr/src/ccache \
-               CCACHE_COMPRESS=1 \
-               CCACHE_COMPILERCHECK="none" \
+               CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+               CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                KVER=$KVER \
                BUILDTARGET="$BUILDTARGET" \
                CROSSTARGET="${CROSSTARGET}" \
@@ -579,8 +579,9 @@ lfsmake2() {
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
-                                               CCACHE_COMPILERCHECK="none" \
+                                               CCACHE_DIR=/usr/src/ccache \
+                                               CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+                                               CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" \
                                                CROSSTARGET="${CROSSTARGET}" \
@@ -620,8 +621,9 @@ ipfiremake() {
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                SYSTEM_RELEASE="$SYSTEM_RELEASE" \
                                                CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
-                                               CCACHE_COMPILERCHECK="none" \
+                                               CCACHE_DIR=/usr/src/ccache \
+                                               CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+                                               CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" \
                                                CROSSTARGET="${CROSSTARGET}" \
@@ -659,8 +661,9 @@ ipfiredist() {
                                        CONFIG_ROOT=$CONFIG_ROOT \
                                        NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                        CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-                                       CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
-                                       CCACHE_COMPILERCHECK="none" \
+                                       CCACHE_DIR=/usr/src/ccache \
+                                       CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+                                       CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \
                                        KVER=$KVER \
                                        BUILDTARGET="$BUILDTARGET" \
                                        CROSSTARGET="${CROSSTARGET}" \