diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-26 13:02:35 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-26 13:02:35 +0000 |
| commit | f4a3dfc4be57b98378b8ce071c25adc1237764be (patch) | |
| tree | 8934dfe4c248e6ae499a82c20b17f566020b7283 /tools | |
| parent | b936bd8c3bfa43779ddab78f3e637791c8349995 (diff) | |
| download | upstream-f4a3dfc4be57b98378b8ce071c25adc1237764be.tar.gz upstream-f4a3dfc4be57b98378b8ce071c25adc1237764be.tar.bz2 upstream-f4a3dfc4be57b98378b8ce071c25adc1237764be.zip | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46498 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -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 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)) |