@@ -1,4 +1,4 @@
-7ab229670f7dad1d79f33929f9a4f8e6e4a71526
+8c056e335cecec67d1d223a329b7ba4dac778a65
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
@@ -497,6 +497,10 @@ s-version: Makefile
zgoarch.go: s-zgoarch; @true
s-zgoarch: Makefile goarch.sh
rm -f zgoarch.go.tmp
+ if ! $(SHELL) $(srcdir)/goarch.sh $(GOARCH) family >/dev/null 2>/dev/null; then \
+ $(SHELL) $(srcdir)/goarch.sh $(GOARCH) family; \
+ exit 1; \
+ fi
echo "package goarch" > zgoarch.go.tmp
echo >> zgoarch.go.tmp
echo 'const GOARCH = "'$(GOARCH)'"' >> zgoarch.go.tmp
@@ -209,6 +209,10 @@ AM_CONDITIONAL(LIBGO_IS_BSD, test $is_darwin = yes -o $is_dragonfly = yes -o $is
AC_SUBST(GOOS)
AC_SUBST(ALLGOOS)
+if test "${GOOS}" = "unknown"; then
+ AC_MSG_ERROR("could not determine GOOS from ${host}")
+fi
+
dnl Test whether we need to use DejaGNU or whether we can use the
dnl simpler gotest approach. We can only use gotest for a native
dnl build.
@@ -376,6 +380,10 @@ AC_SUBST(GOARCH)
AC_SUBST(ALLGOARCH)
AC_SUBST(ALLGOARCHFAMILY)
+if test "${GOARCH}" = "unknown"; then
+ AC_MSG_ERROR("could not determine GOARCH from ${host}")
+fi
+
AM_CONDITIONAL(LIBGO_IS_X86, test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o "$GOARCH" = "amd64p32")
FUNCTION_DESCRIPTORS=false