From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 26 Jul 2015 13:02:35 +0000 (+0000)
Subject: tools: drop circular dependency between patch and ccache, build patch without ccache... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1879233cebecef495fa84e43236a9002f3bed681;p=openwrt%2Fsvn-archive%2Fopenwrt.git

tools: drop circular dependency between patch and ccache, build patch without ccache (fixes #20132)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r46434

SVN-Revision: 46498
---

diff --git a/tools/Makefile b/tools/Makefile
index 2f516d2383..d2fe2ffddf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -73,7 +73,7 @@ $(curdir)/gengetopt/compile := $(curdir)/libtool/install
 $(curdir)/patchelf/compile := $(curdir)/libtool/install
 
 ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
-$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install))
+$(foreach tool, $(filter-out patch,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install))
 tools-y += ccache
 endif
 
diff --git a/tools/patch/Makefile b/tools/patch/Makefile
index 94b3607592..4774478c96 100644
--- a/tools/patch/Makefile
+++ b/tools/patch/Makefile
@@ -15,4 +15,7 @@ PKG_MD5SUM:=e3da7940431633fb65a01b91d3b7a27a
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOSTCC := $(HOSTCC_NOCACHE)
+HOSTCXX := $(HOSTCXX_NOCACHE)
+
 $(eval $(call HostBuild))