domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix host build stampfile usage, fixes spurious errors with missing opkg host binary after deleting the staging dir

Browse Source 
SVN-Revision: 33776
This commit is contained in:
Felix Fietkau
2012-10-15 13:19:41 +00:00
parent 14e14faa0b
commit 6d1884c583
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/host-build.mk
View File

@@ -164,18 +164,6 @@ ifndef DUMP
touch $$@ touch $$@
$(call Host/Exports,$(HOST_STAMP_BUILT)) $(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)) $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))
$(call Host/Compile) $(call Host/Compile)
@@ -187,19 +175,20 @@ ifndef DUMP
$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
mkdir -p $$(shell dirname $$@) mkdir -p $$(shell dirname $$@)
touch $$@ touch $$@
else
$(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE) ifndef STAMP_BUILT
$(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) prepare: host-prepare
$(call Host/Compile) compile: host-compile
$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) install: host-install
$(call Host/Install) clean: host-clean
$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) update: host-update
touch $$@ refresh: host-refresh
endif endif
host-prepare: $(HOST_STAMP_PREPARED) host-prepare: $(HOST_STAMP_PREPARED)
host-configure: $(HOST_STAMP_CONFIGURED) host-configure: $(HOST_STAMP_CONFIGURED)
host-compile: $(HOST_STAMP_BUILT) host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED))
host-install: host-install: $(HOST_STAMP_INSTALLED)
host-clean: FORCE host-clean: FORCE
$(call Host/Clean) $(call Host/Clean)
$(call Host/Uninstall) $(call Host/Uninstall)