jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Go version check and Go in-tree example tests

Browse source 
Fixes #1607
This commit is contained in:
Ian Lance Taylor 2019-08-09 14:06:45 -07:00
commit 62136ff782
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/Makefile.in
View file

@ -1484,7 +1484,7 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
rm -f gopath/$(GOMOD)/src/runme/*; \ rm -f gopath/$(GOMOD)/src/runme/*; \
fi fi
if test -f $(SRCDIR)$(RUNME).go; then \ if test -f $(SRCDIR)$(RUNME).go; then \
cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \ cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
fi fi
GOPATH=`pwd`/gopath/$(GOMOD); \ GOPATH=`pwd`/gopath/$(GOMOD); \
export GOPATH; \ export GOPATH; \
@ -1533,7 +1533,7 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
rm -f gopath/$(GOMOD)/src/runme/*; \ rm -f gopath/$(GOMOD)/src/runme/*; \
fi fi
if test -f $(SRCDIR)$(RUNME).go; then \ if test -f $(SRCDIR)$(RUNME).go; then \
cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \ cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
fi fi
GOPATH=`pwd`/gopath/$(GOMOD); \ GOPATH=`pwd`/gopath/$(GOMOD); \
export GOPATH; \ export GOPATH; \

5
configure.ac
View file

@ -2391,10 +2391,11 @@ else
if test -n "$GO" ; then if test -n "$GO" ; then
GOVERSIONOPTION=version GOVERSIONOPTION=version
go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
AC_MSG_CHECKING([whether go version is too old]) AC_MSG_CHECKING([whether go version is too old])
case $go_version in case $go_version in
go1.[012345]*) go1.[012]*)
AC_MSG_RESULT([yes - minimum version is 1.6]) AC_MSG_RESULT([yes - minimum version is 1.3])
GO= GO=
GOOPT="-intgosize 32" GOOPT="-intgosize 32"
;; ;;