X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/bd47d6edf919f466a871b4ae5b377caa4e95546c..9e7554db871433758f661e85f8ff95501b62d935:/include/host.mk diff --git a/include/host.mk b/include/host.mk index 9d40ec40a..b93ab8d53 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 @@ -28,16 +30,17 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ TAR=`which gtar 2>/dev/null`; \ + [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which gnutar 2>/dev/null`; \ [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ echo "TAR:=$$TAR" >> $@; \ FIND=`which gfind 2>/dev/null`; \ [ -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' >> $@; \