move the toolchain_install stampfile to the right place to fix spurious missing toolc...

SVN-Revision: 16776

diff --git a/include/subdir.mk b/include/subdir.mk
index d93d40fca7577844d291244f703e3a2195768118..3c1e3f9cae07814843e20c9ce4ecd69b7c899354 100644 (file)
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -47,9 +47,9 @@ define subdir
   $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target)))
 endef
 
   $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target)))
 endef
 

-# Parameters: <subdir> <name> <target> <depends> <config options>
+# Parameters: <subdir> <name> <target> <depends> <config options> <stampfile location>

 define stampfile
 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)
   $$($(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 7762593ef6a4d89f7807378fe9aa1fa1a4d628db..61a74b8d1d4187097418e5e2816d7f979422ac0f 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -66,6 +66,6 @@ $(curdir)//install = $(1)/compile
 
 $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
 
 
 $(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)))
 
 $(eval $(call subdir,$(curdir)))