BigW Consortium Gitlab

Skip to content

O
openwrt-zsun
Commit 8dde828e by nbd
Options

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

Signed-off-by: 's avatarFelix Fietkau <nbd@openwrt.org> Backport of r46434 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46498 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent 4beb1aeb
Showing with 4 additions and 1 deletion
tools/Makefile
...@@ -73,7 +73,7 @@ $(curdir)/gengetopt/compile := $(curdir)/libtool/install ...@@ -73,7 +73,7 @@ $(curdir)/gengetopt/compile := $(curdir)/libtool/install
$(curdir)/patchelf/compile := $(curdir)/libtool/install $(curdir)/patchelf/compile := $(curdir)/libtool/install
ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) 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 tools-y += ccache
endif endif
......
tools/patch/Makefile
...@@ -15,4 +15,7 @@ PKG_MD5SUM:=e3da7940431633fb65a01b91d3b7a27a ...@@ -15,4 +15,7 @@ PKG_MD5SUM:=e3da7940431633fb65a01b91d3b7a27a
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOSTCC := $(HOSTCC_NOCACHE)
HOSTCXX := $(HOSTCXX_NOCACHE)
$(eval $(call HostBuild)) $(eval $(call HostBuild))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment