Fix go version matching in configure for go1.10

This commit is contained in:
Vsevolod Kvachev 2018-04-19 23:04:37 +03:00
commit 5f6012039a

View file

@ -2584,7 +2584,7 @@ else
GOVERSIONOPTION=version
go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
case "$go_version" in
go1 | go1.[[01234]]*)
go1 | go1.[[01234]] | go1.[[01234]].*)
GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
;;
*)
@ -2593,7 +2593,7 @@ else
esac
AC_MSG_CHECKING([whether go version is too old])
case $go_version in
go1.1* | go1.0* | go1 )
go1.1.* | go1.1 | go1.0 | go1.0.* | go1 )
AC_MSG_RESULT([yes - minimum version is 1.2])
GO=
GOOPT="-intgosize 32"
@ -2611,13 +2611,13 @@ else
;;
esac
case $go_version in
go1.0* | go1 | go1.1*)
go1.0 | go1.0.* | go1 | go1.1 | go1.1.*)
GOOPT="$GOOPT -use-shlib"
;;
go1.2*)
go1.2 | go1.2.*)
GO12=true
;;
go1.3* | go1.4*)
go1.3 | go1.3.* | go1.4 | go1.4.*)
GO13=true
;;
*)