Author: nbd
Date: 2015-07-26 15:02:35 +0200 (Sun, 26 Jul 2015)
New Revision: 46498

Modified:
   branches/chaos_calmer/tools/Makefile
   branches/chaos_calmer/tools/patch/Makefile
Log:
tools: drop circular dependency between patch and ccache, build patch without 
ccache (fixes #20132)

Signed-off-by: Felix Fietkau <[email protected]>

Backport of r46434

Modified: branches/chaos_calmer/tools/Makefile
===================================================================
--- branches/chaos_calmer/tools/Makefile        2015-07-26 13:01:43 UTC (rev 
46497)
+++ branches/chaos_calmer/tools/Makefile        2015-07-26 13:02:35 UTC (rev 
46498)
@@ -73,7 +73,7 @@
 $(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
 

Modified: branches/chaos_calmer/tools/patch/Makefile
===================================================================
--- branches/chaos_calmer/tools/patch/Makefile  2015-07-26 13:01:43 UTC (rev 
46497)
+++ branches/chaos_calmer/tools/patch/Makefile  2015-07-26 13:02:35 UTC (rev 
46498)
@@ -15,4 +15,7 @@
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOSTCC := $(HOSTCC_NOCACHE)
+HOSTCXX := $(HOSTCXX_NOCACHE)
+
 $(eval $(call HostBuild))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to