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

[Go] Add Makefile testing support for changes in upcoming Go 1.5 release.

Browse source 
No effect on the SWIG program itself.
This commit is contained in:
Ian Lance Taylor 2015-06-19 14:29:38 -07:00
commit c6b3088e58
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Examples/Makefile.in
View file

@ -1774,12 +1774,12 @@ GCCGOOPT = @GCCGOOPT@
GOVERSIONOPTION = @GOVERSIONOPTION@ GOVERSIONOPTION = @GOVERSIONOPTION@
GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi` GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi`
GOCOMPILEARG = `if $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) || $(GO15); then echo -pack ; fi` GOCOMPILEARG = `if $(GO15); then echo tool compile; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) || $(GO15); then echo -pack ; fi`
GOSRCS = $(INTERFACE:.i=.go) GOSRCS = $(INTERFACE:.i=.go)
GOCSRCS = $(INTERFACE:.i=_gc.c) GOCSRCS = $(INTERFACE:.i=_gc.c)
GOLD = $(GOC:c=l) GOLD = `if $(GO15); then echo link; else echo $(GOC:c=l); fi`
GOTOOL = `if $(GO1) ; then echo go tool; fi` GOTOOL = `if $(GO1) ; then echo go tool; fi`
GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi` GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi`
@ -1787,7 +1787,7 @@ GOPACKAGE = $(notdir $(INTERFACE:.i=.a))
GOPATHDIR = gopath/src/$(INTERFACE:.i=) GOPATHDIR = gopath/src/$(INTERFACE:.i=)
GOOBJEXT = $(GOC:c=) GOOBJEXT = `if $(GO15); then echo o; else echo $(GOC:c=); fi`
GOGCOBJS = $(GOSRCS:.go=.$(GOOBJEXT)) GOGCOBJS = $(GOSRCS:.go=.$(GOOBJEXT))
GOGCCOBJS = $(GOSRCS:.go=.@OBJEXT@) GOGCCOBJS = $(GOSRCS:.go=.@OBJEXT@)
@ -1863,7 +1863,7 @@ go: $(SRCDIR_SRCS)
$(COMPILETOOL) $(GCCGO) -c -g $(SRCDIR)$(RUNME).go; \ $(COMPILETOOL) $(GCCGO) -c -g $(SRCDIR)$(RUNME).go; \
$(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE); \ $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE); \
elif $(GO12) || $(GO13) || $(GO15); then \ elif $(GO12) || $(GO13) || $(GO15); then \
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -o $(RUNME).$(GOOBJEXT) $(SRCDIR)$(RUNME).go; \
$(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \ $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
else \ else \
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
@ -1960,7 +1960,7 @@ go_cpp: $(SRCDIR_SRCS)
$(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \ $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \
$(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE) -lstdc++; \ $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE) -lstdc++; \
elif $(GO12) || $(GO13) || $(GO15); then \ elif $(GO12) || $(GO13) || $(GO15); then \
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -o $(RUNME).$(GOOBJEXT) $(SRCDIR)$(RUNME).go; \
$(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \ $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
else \ else \
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \

6
Examples/test-suite/go/Makefile.in
View file

@ -13,12 +13,12 @@ GO15 = @GO15@
GOC = @GOC@ GOC = @GOC@
SCRIPTSUFFIX = _runme.go SCRIPTSUFFIX = _runme.go
GOCOMPILEARG = `if $(GO1) ; then echo tool $(GOC:c=g) ; fi` GOCOMPILEARG = `if $(GO15); then echo tool compile; elif $(GO1); then echo tool $(GOC:c=g); fi`
GOLD = $(GOC:c=l) GOLD = `if $(GO15); then echo link; else echo $(GOC:c=l); fi`
GOTOOL = `if $(GO1) ; then echo go tool; fi` GOTOOL = `if $(GO1) ; then echo go tool; fi`
GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi` GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi`
GOOBJEXT = $(GOC:c=) GOOBJEXT = `if $(GO15); then echo o; else echo $(GOC:c=); fi`
SO = @SO@ SO = @SO@

18
configure.ac
View file

@ -2426,8 +2426,15 @@ else
if test -n "$GO" ; then if test -n "$GO" ; then
GO1=true GO1=true
GOVERSIONOPTION=version GOVERSIONOPTION=version
GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //') go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
case "$go_version" in
go1 | go1.[[01234]]*)
GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
;;
*)
GOC=compile
;;
esac
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.0* | go1 ) go1.0* | go1 )
@ -2437,11 +2444,14 @@ else
;; ;;
*) *)
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
if test "$GOC" = "6c"; then case "$(go env GOARCH)" in
amd64 | arm64 | ppc64*)
GOOPT="-intgosize 64" GOOPT="-intgosize 64"
else ;;
*)
GOOPT="-intgosize 32" GOOPT="-intgosize 32"
fi ;;
esac
;; ;;
esac esac
case $go_version in case $go_version in