X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fhost.mk;h=8b2e56ce510bf7c5d9325c755d82a5b6196c9bfc;hp=6c0dcd6699f39d2202d396b6b45fb77838cf4ea9;hb=e692b6f78e25b78e77387abb0b6e90cbc3407303;hpb=f6777ece942ebd64b3ae43c3c939654577bfc6bd

diff --git a/include/host.mk b/include/host.mk
index 6c0dcd669..8b2e56ce5 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -5,11 +5,15 @@
 # See /LICENSE for more information.
 #
 
-include $(TOPDIR)/.host.mk
+-include $(TMP_DIR)/.host.mk
 
 export TAR
+TMP_DIR ?= $(TOPDIR)/tmp
 
-$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
+ifneq ($(__host_inc),1)
+__host_inc:=1
+$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
+	@mkdir -p $(TMP_DIR)
 	@( \
 		HOST_OS=`uname`; \
 		case "$$HOST_OS" in \
@@ -22,14 +26,21 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/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 tar 2>/dev/null`; \
 		echo "TAR:=$$TAR" >> $@; \
-		if $$TAR --version 2>&1 | grep 'GNU' >/dev/null; then \
-			echo "TAR_WILDCARDS:=--wildcards" >> $@; \
+		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; \
-		ZCAT=`which gzcat`; \
-		[ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \
-		echo "ZCAT:=$$ZCAT" >> $@; \
 	)
 
+endif
+
+ifeq ($(HOST_OS),Linux)
+  XARGS:=xargs -r
+else
+  XARGS:=xargs
+endif