diff options
| author | Ian Lance Taylor <iant@golang.org> | 2024-01-22 17:26:23 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2024-02-02 15:10:02 -0800 |
| commit | cfc6d9ae8143cf0e903384bc63e8d659ca1c9fe7 (patch) | |
| tree | c21c1fb79837ee7d03740ca7f227f68bbab749a8 /libgo | |
| parent | e52d31804a910642c9817bdd400c290a593c98ef (diff) | |
| download | gcc-cfc6d9ae8143cf0e903384bc63e8d659ca1c9fe7.zip gcc-cfc6d9ae8143cf0e903384bc63e8d659ca1c9fe7.tar.gz gcc-cfc6d9ae8143cf0e903384bc63e8d659ca1c9fe7.tar.bz2 | |
libgo: better error messages for unknown GOARCH/GOOS
PR go/113530
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/557655
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/Makefile.am | 4 | ||||
| -rw-r--r-- | libgo/Makefile.in | 4 | ||||
| -rwxr-xr-x | libgo/configure | 8 | ||||
| -rw-r--r-- | libgo/configure.ac | 8 |
4 files changed, 24 insertions, 0 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index c95dc21..3eccadb 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -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 diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 8dcb6d6..0a2b7ee 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -2716,6 +2716,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 diff --git a/libgo/configure b/libgo/configure index db371bc..20bff2b 100755 --- a/libgo/configure +++ b/libgo/configure @@ -14107,6 +14107,10 @@ fi +if test "${GOOS}" = "unknown"; then + as_fn_error $? "\"could not determine GOOS from ${host}\"" "$LINENO" 5 +fi + USE_DEJAGNU=no case ${host} in *-*-rtems*) USE_DEJAGNU=yes ;; @@ -14339,6 +14343,10 @@ esac +if test "${GOARCH}" = "unknown"; then + as_fn_error $? "\"could not determine GOARCH from ${host}\"" "$LINENO" 5 +fi + if test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o "$GOARCH" = "amd64p32"; then LIBGO_IS_X86_TRUE= LIBGO_IS_X86_FALSE='#' diff --git a/libgo/configure.ac b/libgo/configure.ac index e8d66f8..22158ac 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -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 |