X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost.mk;h=2ccab8e1e62bb2637d3641cfe543fcd1315a4606;hb=be206eba3a57128695a00f490767e5c136e43ab7;hp=d163c997dde41b75c89e3551fd3fe83f5e566fbe;hpb=49e628f7652e9f7ce63b932f83b22756a65ff3b9;p=openwrt%2Fstaging%2Fyousong.git

diff --git a/include/host.mk b/include/host.mk
index d163c997dd..2ccab8e1e6 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -1,17 +1,30 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2015 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
+ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)
+  -include $(TMP_DIR)/.host.mk
+endif
 
 ifneq ($(__host_inc),1)
 __host_inc:=1
+
+export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH)
+
+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)
@@ -19,29 +32,15 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 		HOST_OS=`uname`; \
 		case "$$HOST_OS" in \
 			Linux) HOST_ARCH=`uname -m`;; \
+			Darwin) HOST_ARCH=`uname -m`;; \
 			*) HOST_ARCH=`uname -p`;; \
 		esac; \
 		GNU_HOST_NAME=`gcc -dumpmachine`; \
-		[ -n "$$GNU_HOST_NAME" ] || \
-			GNU_HOST_NAME=`$(SCRIPT_DIR)/config.guess`; \
+		[ -z "$$GNU_HOST_NAME" -o "$$HOST_OS" = "Darwin" ] && \
+			GNU_HOST_NAME=`$(TOPDIR)/scripts/config.guess`; \
 		echo "HOST_OS:=$$HOST_OS" > $@; \
 		echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
 		echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
-		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)" >> $@; \
-		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
+	) >/dev/null 2>/dev/null
 
-ifeq ($(HOST_OS),Linux)
-  XARGS:=xargs -r
-else
-  XARGS:=xargs
 endif