X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fhost.mk;h=000fb1898475270eb533d833e5012ecdfd3e50bd;hb=64820db4b264472e03acb9ea6b5536fa7633a8ca;hp=8092e8db77ac74e1f07c2c1ab1e15b7f1a9a30b4;hpb=a37b2b1bf9fdd4e1a5397b96e8456203e39e0903;p=openwrt.git

diff --git a/include/host.mk b/include/host.mk
index 8092e8db77..000fb18984 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -36,7 +36,7 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 			*) HOST_ARCH=`uname -p`;; \
 		esac; \
 		GNU_HOST_NAME=`gcc -dumpmachine`; \
-		[ -z "$$GNU_HOST_NAME" -o "$$HOST_OS" == "Darwin" ] && \
+		[ -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" >> $@; \
@@ -54,11 +54,12 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 		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; \
+		PATCH=`which gpatch 2>/dev/null`; \
+		[ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \
+		echo "PATCH:=$$PATCH" >> $@; \
+		PYTHON=`which python2.7 2>/dev/null`; \
+		[ -n "$$PYTHON" -a -x "$$PYTHON" ] || PYTHON=`which python 2>/dev/null`; \
+		echo "PYTHON:=$$PYTHON" >> $@; \
 	)
 
 endif