X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cb2f53e0b7314fbf6aeee8176c9fc3fe94893e42..c5a8e485748b0fd8db2b4e3251989e23603bf2c1:/include/host.mk diff --git a/include/host.mk b/include/host.mk index 02365d9ea..9b8a32b67 100644 --- a/include/host.mk +++ b/include/host.mk @@ -32,11 +32,12 @@ $(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" >> $@; \ @@ -58,6 +59,9 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk 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