From 7dc435ea2965a0219c3a4e8b2a717030a30b4cad Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 11 Jul 2009 12:48:59 +0000 Subject: [PATCH] move the toolchain_install stampfile to the right place to fix spurious missing toolchain errors after cleaning stuff SVN-Revision: 16776 --- include/subdir.mk | 4 ++-- toolchain/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/subdir.mk b/include/subdir.mk index d93d40fca7..3c1e3f9cae 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -47,9 +47,9 @@ define subdir $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target))) endef -# Parameters: +# Parameters: define stampfile - $(1)/stamp-$(3):=$(STAGING_DIR)/stamp/.$(2)_$(3)$(if $(5),_$(call confvar,$(5))) + $(1)/stamp-$(3):=$(if $(6),$(6),$(STAGING_DIR))/stamp/.$(2)_$(3)$(if $(5),_$(call confvar,$(5))) $$($(1)/stamp-$(3)): $(TMP_DIR)/.build $(4) @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) $(4) || \ $(MAKE) $$($(1)/flags-$(3)) $(1)/$(3) diff --git a/toolchain/Makefile b/toolchain/Makefile index 7762593ef6..61a74b8d1d 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -66,6 +66,6 @@ $(curdir)//install = $(1)/compile $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed: -$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed)) +$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR))) $(eval $(call subdir,$(curdir))) -- 2.25.1