From 3f21b22f0ff55ff6d9778d56d90d61a18eb38a0c Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 24 Jul 2022 23:46:54 +0200
Subject: [PATCH] - host-ccache: move target to package dir

---
 make/host-tools.mk       | 28 ---------------------------
 package/ccache/ccache.mk | 41 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 28 deletions(-)
 create mode 100644 package/ccache/ccache.mk

diff --git a/make/host-tools.mk b/make/host-tools.mk
index bccdcdda..a5bf1194 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -5,7 +5,6 @@
 
 $(HOST_DIR):
 	$(INSTALL) -d $(HOST_DIR)
-	$(INSTALL) -d $(HOST_DIR)/bin
 	$(INSTALL) -d $(HOST_DEPS_DIR)
 
 # -----------------------------------------------------------------------------
@@ -34,31 +33,4 @@ $(PKG_CONFIG): $(PKG_CONFIG_DEPENDENCIES) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-# helper target to create ccache links
-
-ifndef CCACHE
-CCACHE := ccache
-endif
-CCACHE := $(shell which $(CCACHE) || type -p $(CCACHE) || echo ccache)
-
-CCACHE_DIR = $(HOME)/.ccache-$(call LOWERCASE,$(TARGET_VENDOR))-$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)
-export CCACHE_DIR
-
-host-ccache: find-ccache $(CCACHE) | $(HOST_DIR) \
-	$(HOST_DIR)/bin/cc \
-	$(HOST_DIR)/bin/gcc \
-	$(HOST_DIR)/bin/g++ \
-	$(HOST_DIR)/bin/$(TARGET_CC) \
-	$(HOST_DIR)/bin/$(TARGET_CXX)
-
-$(HOST_DIR)/bin/cc \
-$(HOST_DIR)/bin/gcc \
-$(HOST_DIR)/bin/g++ \
-$(HOST_DIR)/bin/$(TARGET_CC) \
-$(HOST_DIR)/bin/$(TARGET_CXX):
-	ln -sf $(CCACHE) $(@)
-
-# -----------------------------------------------------------------------------
-
 PHONY += host-tools
-PHONY += host-ccache
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
new file mode 100644
index 00000000..c4e6c6d3
--- /dev/null
+++ b/package/ccache/ccache.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# ccache
+#
+################################################################################
+
+ifndef CCACHE
+CCACHE := ccache
+endif
+CCACHE := $(shell which $(CCACHE) || type -p $(CCACHE) || echo ccache)
+
+CCACHE_DIR = $(HOME)/.ccache-$(call LOWERCASE,$(TARGET_VENDOR))-$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)
+export CCACHE_DIR
+
+# ------------------------------------------------------------------------------
+
+HOST_CCACHE_BINDIR = $(HOST_DIR)/bin
+
+$(HOST_CCACHE_BINDIR): | $(HOST_DIR)
+	$(INSTALL) -d $(HOST_CCACHE_BINDIR)
+
+HOST_CCACHE_HOST_LINKS = \
+	$(HOST_CCACHE_BINDIR)/cc \
+	$(HOST_CCACHE_BINDIR)/gcc \
+	$(HOST_CCACHE_BINDIR)/cpp \
+	$(HOST_CCACHE_BINDIR)/g++
+
+HOST_CCACHE_TARGET_LINKS = \
+	$(HOST_CCACHE_BINDIR)/$(TARGET_CC) \
+	$(HOST_CCACHE_BINDIR)/$(TARGET_CPP) \
+	$(HOST_CCACHE_BINDIR)/$(TARGET_CXX)
+
+$(HOST_CCACHE_HOST_LINKS) \
+$(HOST_CCACHE_TARGET_LINKS): | $(HOST_CCACHE_BINDIR)
+	ln -sf $(CCACHE) $(@)
+
+HOST_CCACHE_DEPENDENCIES = find-ccache $(CCACHE) \
+	$(HOST_CCACHE_HOST_LINKS) \
+	$(HOST_CCACHE_TARGET_LINKS)
+
+host-ccache: $(HOST_CCACHE_DEPENDENCIES)