X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e692b6f78e25b78e77387abb0b6e90cbc3407303..a74b524343dd3139dac936555827c2ce86bf042d:/include/host.mk diff --git a/include/host.mk b/include/host.mk index 8b2e56ce5..b93ab8d53 100644 --- a/include/host.mk +++ b/include/host.mk @@ -1,17 +1,20 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # --include $(TMP_DIR)/.host.mk - -export TAR TMP_DIR ?= $(TOPDIR)/tmp +ifeq ($(if $(TARGET_BUILD),,$(DUMP)),) + -include $(TMP_DIR)/.host.mk +endif + +export TAR FIND ifneq ($(__host_inc),1) __host_inc:=1 +.PRECIOUS: $(TMP_DIR)/.host.mk $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk @mkdir -p $(TMP_DIR) @( \ @@ -27,20 +30,23 @@ $(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' >> $@; \ + else \ + echo 'XARGS:=xargs' >> $@; \ fi; \ ) endif - -ifeq ($(HOST_OS),Linux) - XARGS:=xargs -r -else - XARGS:=xargs -endif