X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fflorian.git;a=blobdiff_plain;f=include%2Fhost.mk;h=9d0c64372a3075634d95914971b05a4c3cacc986;hp=9d40ec40a31b2487d9316534bf3991ab3d6a47c3;hb=0a2efdd06a0c5973fe25c8cef2034c3a543d8279;hpb=171e7134db9ab6166aa97eddcc00beec81f9f35f diff --git a/include/host.mk b/include/host.mk index 9d40ec40a3..9d0c64372a 100644 --- a/include/host.mk +++ b/include/host.mk @@ -6,9 +6,11 @@ # TMP_DIR ?= $(TOPDIR)/tmp --include $(TMP_DIR)/.host.mk +ifeq ($(if $(TARGET_BUILD),,$(DUMP)),) + -include $(TMP_DIR)/.host.mk +endif -export TAR +export TAR FIND ifneq ($(__host_inc),1) __host_inc:=1 @@ -34,10 +36,10 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk [ -n "$$FIND" -a -x "$$FIND" ] || FIND=`which find 2>/dev/null`; \ echo "FIND:=$$FIND" >> $@; \ echo "BASH:=$(shell which bash)" >> $@; \ - if find -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \ - echo 'FIND_L=find -L $$(1)' >>$@; \ + if $$FIND -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \ + echo "FIND_L=$$FIND -L \$$(1)" >>$@; \ else \ - echo 'FIND_L=find $$(1) -follow' >> $@; \ + echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \ fi; \ if xargs --help 2>&1 | grep 'gnu.org' >/dev/null; then \ echo 'XARGS:=xargs -r' >> $@; \