diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-11 12:48:59 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-11 12:48:59 +0000 |
| commit | d975a4247b2a8a3011d5c53b548aa6c837419d67 (patch) | |
| tree | 5b7ff86cc5ecc551dd421147dc6f8ddbb5b1b5ea | |
| parent | c41d46bc820b939a98045b50e99d283f49fc44ff (diff) | |
move the toolchain_install stampfile to the right place to fix spurious missing toolchain errors after cleaning stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16776 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/subdir.mk | 4 | ||||
| -rw-r--r-- | toolchain/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index d93d40fca..3c1e3f9ca 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -47,9 +47,9 @@ define subdir $(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 - $(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 7762593ef..61a74b8d1 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))) |