diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-10-15 13:19:41 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-15 13:19:41 +0000 |
commit | 95249233fcb65328461abb030c106f2492925f91 (patch) | |
tree | 130a4b10948779c091e9854a63eeebc5e8638345 | |
parent | 2755bd50cc5f055539449e10aa14aeac2ee209a6 (diff) | |
download | upstream-95249233fcb65328461abb030c106f2492925f91.tar.gz upstream-95249233fcb65328461abb030c106f2492925f91.tar.bz2 upstream-95249233fcb65328461abb030c106f2492925f91.zip |
build: fix host build stampfile usage, fixes spurious errors with missing opkg host binary after deleting the staging dir
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33776 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | include/host-build.mk | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index 60b7b9f916..320e74ee47 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -164,42 +164,31 @@ ifndef DUMP touch $$@ $(call Host/Exports,$(HOST_STAMP_BUILT)) - ifdef Host/Install - host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)) - endif - - ifndef STAMP_BUILT - prepare: host-prepare - compile: host-compile - install: host-install - clean: host-clean - update: host-update - refresh: host-refresh - - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) $(call Host/Compile) $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) touch $$@ - $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) + $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) $(call Host/Install) $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) mkdir -p $$(shell dirname $$@) touch $$@ - else - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE) - $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) - $(call Host/Compile) - $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) - $(call Host/Install) - $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) - touch $$@ + + ifndef STAMP_BUILT + prepare: host-prepare + compile: host-compile + install: host-install + clean: host-clean + update: host-update + refresh: host-refresh endif + host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED) - host-compile: $(HOST_STAMP_BUILT) - host-install: + host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED)) + host-install: $(HOST_STAMP_INSTALLED) host-clean: FORCE $(call Host/Clean) $(call Host/Uninstall) |