From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 9 Jan 2016 19:48:21 +0000 (+0000)
Subject: ccache: Include hash of compiler specs in hashing
X-Git-Tag: v2.19-core100~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d9be34e2a617efa19135b646914fb1ef507a8b9;p=people%2Fpmueller%2Fipfire-2.x.git

ccache: Include hash of compiler specs in hashing

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

diff --git a/lfs/Config b/lfs/Config
index a65b0cf4e4..e2396459cf 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -57,6 +57,9 @@ DIR_CONF    = $(LFS_BASEDIR)/config
 DIR_INFO    = $(LFS_BASEDIR)/log
 DIR_TMP     = /tmp
 
+# Add the compiler location and version and specs to the ccache hash
+CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1)
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
diff --git a/make.sh b/make.sh
index 95748468e3..0b6953346e 100755
--- a/make.sh
+++ b/make.sh
@@ -221,7 +221,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"
+    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