X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fhost.mk;h=d163c997dde41b75c89e3551fd3fe83f5e566fbe;hb=f9d0822cd1d8e9966c6b76f4d4f65d32abcef61e;hp=278ad726ff3d04def5f69f774651ca14fa354132;hpb=b15238f536bdcbc1fb85c67940b97f1463f90ca0;p=openwrt.git

diff --git a/include/host.mk b/include/host.mk
index 278ad726ff..d163c997dd 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -1,14 +1,18 @@
 # 
-# 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
+-include $(TMP_DIR)/.host.mk
 
 export TAR
 
+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 +27,21 @@ $(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 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)" >> $@; \
+		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; \
 	)
 
+endif
+
+ifeq ($(HOST_OS),Linux)
+  XARGS:=xargs -r
+else
+  XARGS:=xargs
+endif