]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
make.sh: Keep a separate ccache for each toolchain
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 Apr 2021 16:16:32 +0000 (16:16 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 May 2021 10:32:11 +0000 (10:32 +0000)
Because we are deactivating the compiler checksumming, we need to keep a
distinct cache between different versions of the toolchain.

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

diff --git a/make.sh b/make.sh
index e0d6a9c4f563bd789a3c30e7cdd2e11567398fa5..113016905587bccd55be99c81a54e80559c1b1be 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -480,7 +480,7 @@ prepareenv() {
        mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null
        mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
        mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
-       mkdir -p $BASEDIR/{cache,ccache/${BUILD_ARCH}} 2>/dev/null
+       mkdir -p $BASEDIR/{cache,ccache/${BUILD_ARCH}/${TOOLCHAINVER}} 2>/dev/null
 
        if [ "${ENABLE_RAMDISK}" = "on" ]; then
                mkdir -p $BASEDIR/build/usr/src
@@ -502,7 +502,7 @@ prepareenv() {
        mount --bind /proc           $BASEDIR/build/proc
        mount --bind /sys            $BASEDIR/build/sys
        mount --bind $BASEDIR/cache  $BASEDIR/build/usr/src/cache
-       mount --bind $BASEDIR/ccache/${BUILD_ARCH} $BASEDIR/build/usr/src/ccache
+       mount --bind $BASEDIR/ccache/${BUILD_ARCH}/${TOOLCHAINVER} $BASEDIR/build/usr/src/ccache
        mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config
        mount --bind $BASEDIR/doc    $BASEDIR/build/usr/src/doc
        mount --bind $BASEDIR/html   $BASEDIR/build/usr/src/html