diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-20 10:50:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-20 10:50:46 +0000 |
| commit | 9402cb747ef51c43046b7159061afb50a4302f3b (patch) | |
| tree | 2a06dc572b815704d2fe2ab22b1a986dfd34df97 | |
| parent | 38dbf49b61c56aee551bf425e8e47e7cfa12be36 (diff) | |
| download | upstream-9402cb747ef51c43046b7159061afb50a4302f3b.tar.gz upstream-9402cb747ef51c43046b7159061afb50a4302f3b.tar.bz2 upstream-9402cb747ef51c43046b7159061afb50a4302f3b.zip | |
tools: drop circular dependency between patch and ccache, build patch without ccache (fixes #20132)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46434
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/patch/Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8b5dd6c520..60041ddc31 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)) |