X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e692b6f78e25b78e77387abb0b6e90cbc3407303..9a3973d64e53d52287ee8ba12c2c0cb7eb8998e9:/include/host.mk?ds=sidebyside

diff --git a/include/host.mk b/include/host.mk
index 8b2e56ce5..b6a58248f 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -1,17 +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.
 #
 
+TMP_DIR ?= $(TOPDIR)/tmp
 -include $(TMP_DIR)/.host.mk
 
-export TAR
-TMP_DIR ?= $(TOPDIR)/tmp
+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)
 	@( \
@@ -29,18 +30,20 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 		TAR=`which gtar 2>/dev/null`; \
 		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
 		echo "TAR:=$$TAR" >> $@; \
+		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)' >>$@; \
+		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 'FIND_L=find $$(1) -follow' >> $@; \
+			echo 'XARGS:=xargs' >> $@; \
 		fi; \
 	)
 
 endif
-
-ifeq ($(HOST_OS),Linux)
-  XARGS:=xargs -r
-else
-  XARGS:=xargs
-endif