Author: nbd
Date: 2015-07-20 12:50:46 +0200 (Mon, 20 Jul 2015)
New Revision: 46434

Modified:
   trunk/tools/Makefile
   trunk/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]>

Modified: trunk/tools/Makefile
===================================================================
--- trunk/tools/Makefile        2015-07-20 06:01:18 UTC (rev 46433)
+++ trunk/tools/Makefile        2015-07-20 10:50:46 UTC (rev 46434)
@@ -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: trunk/tools/patch/Makefile
===================================================================
--- trunk/tools/patch/Makefile  2015-07-20 06:01:18 UTC (rev 46433)
+++ trunk/tools/patch/Makefile  2015-07-20 10:50:46 UTC (rev 46434)
@@ -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