From 7a7f4c58dc5dd5820edaed95d4d469c136f58767 Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Sun, 1 Oct 2017 23:57:15 +0200
Subject: [PATCH] - use separate ccache directory for each crosstool

---
 make/clean.mk       | 4 ++++
 make/crosstool.mk   | 3 ++-
 make/environment.mk | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/make/clean.mk b/make/clean.mk
index ff4e0a3f..7cb4eb50 100644
--- a/make/clean.mk
+++ b/make/clean.mk
@@ -28,4 +28,8 @@ clean-all:
 	make staging-clean
 	make clean
 
+ccache-clean:
+	@echo "Clearing $$CCACHE_DIR"
+	@$(CCACHE) -C
+
 PHONY += rebuild-clean all-clean pkg-clean
diff --git a/make/crosstool.mk b/make/crosstool.mk
index 4c7e2a01..fb0cb144 100644
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -7,8 +7,9 @@ crosstools:
 	make crosstool-arm-hd2 BOXSERIES=hd2
 
 crosstools-renew:
-	ccache -cCz
+	make ccache-clean BOXSERIES=hd1
 	rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd1
+	make ccache-clean BOXSERIES=hd2
 	rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd2
 	rm -rf $(HOSTPREFIX)/bin/arm-*
 	rm -rf $(HOSTPREFIX)/bin/pkg-config
diff --git a/make/environment.mk b/make/environment.mk
index 7074c77b..e702081b 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -130,6 +130,8 @@ TARGETLIB     = $(TARGETPREFIX)/lib
 TARGETINCLUDE = $(TARGETPREFIX)/include
 BUILD        ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess)
 CCACHE        = /usr/bin/ccache
+CCACHE_DIR    = $(HOME)/.ccache-ni-buildsystem-$(BOXARCH)-$(BOXSERIES)
+export CCACHE_DIR
 
 # create debug image
 DEBUG ?= no