X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=inline;f=include%2Fhost.mk;h=833aa83a66fb3c75204c6fe74160e4a59d3fbc15;hb=93f0b2377f4c571b41a02a4ea812d2e09985c796;hp=ed961e35d91a662d4427166d4adcdc9731ea3ebd;hpb=e158d8b6a7b3c883a8be74cb2327dda6374fc050;p=openwrt-10.03%2F.git

diff --git a/include/host.mk b/include/host.mk
index ed961e35d..833aa83a6 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -9,7 +9,10 @@ include $(TMP_DIR)/.host.mk
 
 export TAR
 
-$(TMP_DIR)/.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,11 +25,16 @@ $(TMP_DIR)/.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" >> $@; \
-		ZCAT=`which gzcat`; \
-		[ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \
-		echo "ZCAT:=$$ZCAT" >> $@; \
+		echo "BASH:=$(shell which bash)" >> $@; \
 	)
 
+endif
+
+ifeq ($(HOST_OS),Linux)
+  XARGS:=xargs -r
+else
+  XARGS:=xargs
+endif