X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fhost.mk;h=833aa83a66fb3c75204c6fe74160e4a59d3fbc15;hb=59d8027541e6c38150ea5d29f73b49476fd89ea7;hp=abcf045d01e05327408dcb6e9bc8310b695ee74d;hpb=fa8f555b9dc6b1476a806acc191a58241875a7ea;p=openwrt-10.03%2F.git

diff --git a/include/host.mk b/include/host.mk
index abcf045d0..833aa83a6 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -5,9 +5,14 @@
 # See /LICENSE for more information.
 #
 
-include $(TOPDIR)/.host.mk
+include $(TMP_DIR)/.host.mk
 
-$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
+export TAR
+
+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 \
@@ -20,8 +25,16 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
 		echo "HOST_OS:=$$HOST_OS" > $@; \
 		echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
 		echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
-		if tar --version 2>&1 | grep 'GNU' >/dev/null; then \
-			echo "TAR_WILDCARDS:=--wildcards" >> $@; \
-		fi; \
+		TAR=`which gtar 2>/dev/null`; \
+		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
+		echo "TAR:=$$TAR" >> $@; \
+		echo "BASH:=$(shell which bash)" >> $@; \
 	)
 
+endif
+
+ifeq ($(HOST_OS),Linux)
+  XARGS:=xargs -r
+else
+  XARGS:=xargs
+endif