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

Configure fix and warning fix for Go

Browse source
This commit is contained in:
William S Fulton 2015-03-14 23:40:30 +00:00
commit 7fa1058a8a
2 changed files with 59 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Modules/go.cxx
View file

@ -6314,7 +6314,7 @@ private:
String *ct = Getattr(n, "emit:cgotype"); String *ct = Getattr(n, "emit:cgotype");
if (ct) { if (ct) {
*c_struct_type = (bool)Getattr(n, "emit:cgotypestruct"); *c_struct_type = Getattr(n, "emit:cgotypestruct") ? true : false;
return Copy(ct); return Copy(ct);
} }

112
configure.ac
View file

@ -2333,8 +2333,6 @@ else
GO="$GOBIN" GO="$GOBIN"
fi fi
AC_CHECK_PROGS(GCCGO, gccgo)
GOGCC=false GOGCC=false
GCCGO= GCCGO=
GO1=false GO1=false
@ -2345,61 +2343,67 @@ else
GCCGOOPT= GCCGOOPT=
GOVERSIONOPTION= GOVERSIONOPTION=
GO1=true if test -n "$GO" ; then
GOVERSIONOPTION=version GO1=true
GOC=$(sh -c "$(go env) && echo \$GOCHAR")c GOVERSIONOPTION=version
go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //') GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
AC_MSG_CHECKING([whether go version is too old]) go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
case $go_version in AC_MSG_CHECKING([whether go version is too old])
go1.0* | go1 ) case $go_version in
AC_MSG_RESULT([yes - minimum version is 1.1]) go1.0* | go1 )
GO= AC_MSG_RESULT([yes - minimum version is 1.1])
GOOPT="-intgosize 32" GO=
;;
*)
AC_MSG_RESULT([no])
if test "$GOC" = "6c"; then
GOOPT="-intgosize 64"
else
GOOPT="-intgosize 32" GOOPT="-intgosize 32"
fi ;;
;; *)
esac
case $go_version in
go1.0* | go1 | go1.1*)
GOOPT="$GOOPT -use-shlib"
;;
go1.2*)
GO12=true
;;
go1.3* | go1.4*)
GO13=true
;;
*)
GO15=true
;;
esac
if $GCCGO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
AC_MSG_CHECKING([whether gccgo version is too old])
go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
if test "x$go_version" = x; then
AC_MSG_RESULT([could not determine gccgo version])
GCCGO=
elif test "$go_version" -lt 470; then
AC_MSG_RESULT([yes - minimum version is 4.7.0])
GCCGO=
else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
if test "$go_version" -lt 480; then if test "$GOC" = "6c"; then
GCCGOOPT="-intgosize 32" GOOPT="-intgosize 64"
else else
AC_CHECK_SIZEOF([void *], [4]) GOOPT="-intgosize 32"
if test "$ac_cv_sizeof_void_p" = "8"; then fi
GCCGOOPT="-intgosize 64" ;;
else esac
GCCGOOPT="-intgosize 32" case $go_version in
fi go1.0* | go1 | go1.1*)
GOOPT="$GOOPT -use-shlib"
;;
go1.2*)
GO12=true
;;
go1.3* | go1.4*)
GO13=true
;;
*)
GO15=true
;;
esac
fi
AC_CHECK_PROGS(GCCGO, gccgo)
if test -n "$GCCGO" ; then
if $GCCGO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
AC_MSG_CHECKING([whether gccgo version is too old])
go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
if test "x$go_version" = x; then
AC_MSG_RESULT([could not determine gccgo version])
GCCGO=
elif test "$go_version" -lt 470; then
AC_MSG_RESULT([yes - minimum version is 4.7.0])
GCCGO=
else
AC_MSG_RESULT([no])
if test "$go_version" -lt 480; then
GCCGOOPT="-intgosize 32"
else
AC_CHECK_SIZEOF([void *], [4])
if test "$ac_cv_sizeof_void_p" = "8"; then
GCCGOOPT="-intgosize 64"
else
GCCGOOPT="-intgosize 32"
fi
fi
fi fi
fi fi
fi fi