- ensure $MAKE is set

- support $MAKE as gmake for getvars()

tools/gcc/mknative.common

@@ -1,4 +1,4 @@
-#	$NetBSD: mknative.common,v 1.3 2004/12/11 07:40:50 jmc Exp $
+#	$NetBSD: mknative.common,v 1.4 2006/05/12 02:07:59 mrg Exp $
 #
 # from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
 #
@@ -10,11 +10,30 @@ bomb()
 	exit 1
 }
 
+# Make sure we can run OK.
+if [ -x "$MAKE" ]; then
+	:
+else
+	bomb "MAKE not set"
+fi
+
 # usage: getvars MAKEFILE VARNAME [VARNAME...]
 #
 getvars()
 {
 	_mf="$1"; shift
+	case "$MAKE" in
+	*gmake)
+	env MAKEFLAGS= $MAKE -f - -f "$_TMPDIR/$_mf" _x_ <<EOF || bomb "getvars $_mf $* failed"
+define echo_var
+	@echo G_\${var}=\${\${var}} | sed -e 's,\([^\.]\)\./\([a-zA-Z0-9_-]*\.o\),\1\2,g' -e 's,$_VPATH,\$\${GNUHOSTDIST},g'
+
+endef
+_x_:
+	\$(foreach var,$*,\$(echo_var))
+EOF
+		;;
+	*)
 	$MAKE -f - _x_ <<EOF || bomb "getvars $_mf $* failed"
 _x_:
 .for var in $*
@@ -22,6 +41,8 @@ _x_:
 .endfor
 .include "$_TMPDIR/$_mf"
 EOF
+	;;
+	esac
 }
 
 # usage: write_c FILENAME