X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/af927159a9e65228875999840012a1cde1c36b6a..54eef89c33341b16ead9ff7617aad06fb93828dd:/include/host.mk diff --git a/include/host.mk b/include/host.mk index d163c997d..9b8a32b67 100644 --- a/include/host.mk +++ b/include/host.mk @@ -1,17 +1,30 @@ # -# Copyright (C) 2007 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. # TMP_DIR ?= $(TOPDIR)/tmp --include $(TMP_DIR)/.host.mk +ifeq ($(if $(TARGET_BUILD),,$(DUMP)),) + -include $(TMP_DIR)/.host.mk +endif -export TAR +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) @@ -19,29 +32,36 @@ $(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 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)' >>$@; \ + 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' >> $@; \ + 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; \ + PATCH=`which gpatch 2>/dev/null`; \ + [ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \ + echo "PATCH:=$$PATCH" >> $@; \ ) endif - -ifeq ($(HOST_OS),Linux) - XARGS:=xargs -r -else - XARGS:=xargs -endif