X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b15238f536bdcbc1fb85c67940b97f1463f90ca0..e8aecaf8526a8fde73c536f74a65a93e41c692f6:/include/host.mk

diff --git a/include/host.mk b/include/host.mk
index 278ad726f..b93ab8d53 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -1,14 +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
+TMP_DIR ?= $(TOPDIR)/tmp
+ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)
+  -include $(TMP_DIR)/.host.mk
+endif
 
-export TAR
+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)
 	@( \
@@ -23,12 +29,24 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 		echo "HOST_OS:=$$HOST_OS" > $@; \
 		echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
 		echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
-		TAR=`which gtar`; \
-		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar`; \
+		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" >> $@; \
-		ZCAT=`which gzcat`; \
-		[ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \
-		echo "ZCAT:=$$ZCAT" >> $@; \
+		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)" >>$@; \
+		else \
+			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