X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fhost.mk;h=3a5fd9683e3592f4750a80964a321075e388cde7;hb=0c0df9eb082d5ff83d0f22f6e00bf580729fb49d;hp=93f86dce8aafbdc5a3a379455787a657188bc97d;hpb=ba9d778c9706dc3774edcb0216ce551f057cb6e3;p=openwrt.git

diff --git a/include/host.mk b/include/host.mk
index 93f86dce8a..3a5fd9683e 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -7,22 +7,25 @@
 
 include $(TOPDIR)/.host.mk
 
+export TAR
+
 $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
-	@echo "HOST_OS:=`uname`" > $@
-	@echo "HOST_ARCH:=` \
-		$(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-			-e 's/sparc.*/sparc/' \
-			-e 's/arm.*/arm/' \
-			-e 's/m68k.*/m68k/' \
-			-e 's/ppc/powerpc/' \
-			-e 's/v850.*/v850/' \
-			-e 's/sh[234]/sh/' \
-			-e 's/mips-.*/mips/' \
-			-e 's/mipsel-.*/mipsel/' \
-			-e 's/cris.*/cris/' \
-			-e 's/i[3-9]86/i386/'`" >> $@
-	@echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@
-	@if tar --version 2>&1 | grep 'GNU' >/dev/null; then \
-		echo "TAR_OPTIONS+=--wildcards" >> $@; \
-	fi
+	@( \
+		HOST_OS=`uname`; \
+		case "$$HOST_OS" in \
+			Linux) 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`; \
+		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" >> $@; \
+		fi; \
+		TAR=`which gtar tar | head -n 1`; \
+		echo "TAR:=$$TAR" >> $@; \
+	)