55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 62136ff782e9bf6641970f716d7d40afcf6c49ea Mon Sep 17 00:00:00 2001
|
|
From: Ian Lance Taylor <iant@golang.org>
|
|
Date: Fri, 9 Aug 2019 14:06:45 -0700
|
|
Subject: [PATCH] Fix Go version check and Go in-tree example tests
|
|
|
|
Fixes #1607
|
|
---
|
|
Examples/Makefile.in | 4 ++--
|
|
configure.ac | 5 +++--
|
|
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
|
|
index 9e05d2763..6fbca29db 100644
|
|
--- a/Examples/Makefile.in
|
|
+++ b/Examples/Makefile.in
|
|
@@ -1484,7 +1484,7 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
|
|
rm -f gopath/$(GOMOD)/src/runme/*; \
|
|
fi
|
|
if test -f $(SRCDIR)$(RUNME).go; then \
|
|
- cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \
|
|
+ cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
|
|
fi
|
|
GOPATH=`pwd`/gopath/$(GOMOD); \
|
|
export GOPATH; \
|
|
@@ -1533,7 +1533,7 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
|
|
rm -f gopath/$(GOMOD)/src/runme/*; \
|
|
fi
|
|
if test -f $(SRCDIR)$(RUNME).go; then \
|
|
- cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \
|
|
+ cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
|
|
fi
|
|
GOPATH=`pwd`/gopath/$(GOMOD); \
|
|
export GOPATH; \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 73c38a72c..63509cd66 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2391,10 +2391,11 @@ else
|
|
|
|
if test -n "$GO" ; then
|
|
GOVERSIONOPTION=version
|
|
+ go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
|
|
AC_MSG_CHECKING([whether go version is too old])
|
|
case $go_version in
|
|
- go1.[012345]*)
|
|
- AC_MSG_RESULT([yes - minimum version is 1.6])
|
|
+ go1.[012]*)
|
|
+ AC_MSG_RESULT([yes - minimum version is 1.3])
|
|
GO=
|
|
GOOPT="-intgosize 32"
|
|
;;
|
|
--
|
|
2.20.1
|
|
|