mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 02:13:55 +02:00
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
This commit is contained in:
parent
7c3d251e31
commit
07540fb955
@ -164,9 +164,17 @@ ifndef DUMP
|
||||
touch $$@
|
||||
|
||||
$(call Host/Exports,$(HOST_STAMP_BUILT))
|
||||
ifdef Host/Install
|
||||
host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED))
|
||||
endif
|
||||
$(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)
|
||||
$(call Host/Install)
|
||||
$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
|
||||
mkdir -p $$(shell dirname $$@)
|
||||
touch $$@
|
||||
|
||||
ifndef STAMP_BUILT
|
||||
prepare: host-prepare
|
||||
@ -175,31 +183,12 @@ ifndef DUMP
|
||||
clean: host-clean
|
||||
update: host-update
|
||||
refresh: host-refresh
|
||||
|
||||
$(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)
|
||||
$(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 $$@
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user