X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fhost.mk;h=02365d9eabdf074a35c6cccc20eeb9bf8709ffd0;hp=abcf045d01e05327408dcb6e9bc8310b695ee74d;hb=e30e495bb1cd6df96e6b246a89c8eade514031c7;hpb=fa8f555b9dc6b1476a806acc191a58241875a7ea;ds=sidebyside

diff --git a/include/host.mk b/include/host.mk
index abcf045d0..02365d9ea 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -1,13 +1,33 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
-include $(TOPDIR)/.host.mk
+TMP_DIR ?= $(TOPDIR)/tmp
+ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)
+  -include $(TMP_DIR)/.host.mk
+endif
 
-$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
+export TAR FIND
+
+ifneq ($(__host_inc),1)
+__host_inc:=1
+
+try-run = $(shell set -e; \
+	TMP_F="$(TMP_DIR)/try-run.$$$$.tmp"; \
+	if ($(1)) >/dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi; \
+	rm -f "$$TMP_F"; \
+)
+
+host-cc-option = $(call try-run, \
+	$(HOSTCC) $(HOST_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP_F",$(1),$(2) \
+)
+
+.PRECIOUS: $(TMP_DIR)/.host.mk
+$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
+	@mkdir -p $(TMP_DIR)
 	@( \
 		HOST_OS=`uname`; \
 		case "$$HOST_OS" in \
@@ -20,8 +40,24 @@ $(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" >> $@; \
+		TAR=`which gtar 2>/dev/null`; \
+		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which gnutar 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)" >>$@; \
+		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 'XARGS:=xargs' >> $@; \
 		fi; \
 	)
 
+endif