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

[Go] Fixes so that the go_subdir_import test will work with gccgo.

Browse source
This commit is contained in:
Ian Lance Taylor 2015-02-22 11:01:24 -08:00
commit 40f5b1ecc6
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Examples/Makefile.in
View file

@ -1760,7 +1760,7 @@ GOOPT = @GOOPT@
GOVERSIONOPTION = @GOVERSIONOPTION@ GOVERSIONOPTION = @GOVERSIONOPTION@
GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi` GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi`
GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) ; then echo -pack ; fi` GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) && ! $(GOGCC); then echo -pack ; fi`
GOSRCS = $(INTERFACE:.i=.go) GOSRCS = $(INTERFACE:.i=.go)
GOCSRCS = $(INTERFACE:.i=_gc.c) GOCSRCS = $(INTERFACE:.i=_gc.c)
@ -1822,16 +1822,16 @@ go_cpp: $(SRCDIR_SRCS)
$(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \ $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \
fi; \ fi; \
$(foreach f,$(ICXXSRCS), \ $(foreach f,$(ICXXSRCS), \
$(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o $(addsuffix .o,$(basename $f)) $f $(INCLUDES); \ $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o $(addsuffix .@OBJEXT@,$(basename $f)) $f $(INCLUDES); \
) \ ) \
else \ else \
$(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \ $(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \ $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \
fi fi
if ! $(GOGCC) ; then \
$(foreach f,$(GOSRCS), \ $(foreach f,$(GOSRCS), \
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f \ $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f \
) ); \
if ! $(GOGCC) ; then \
$(foreach f,$(GOCSRCS), \ $(foreach f,$(GOCSRCS), \
$(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} \ $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} \
-o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f; \ -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f; \
@ -1845,6 +1845,10 @@ go_cpp: $(SRCDIR_SRCS)
else \ else \
$(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \ $(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \
fi; \ fi; \
else \
$(foreach f,$(GOSRCS), \
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .@OBJEXT@,$(basename $f)) $f \
); \
fi fi
if test -f $(SRCDIR)$(RUNME).go; then \ if test -f $(SRCDIR)$(RUNME).go; then \
$(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \ $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
@ -1862,7 +1866,7 @@ go_cpp: $(SRCDIR_SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
go_run: go_run:
env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) ./$(RUNME) $(RUNPIPE) env $(RUNTOOL) ./$(RUNME) $(RUNPIPE)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Version display # Version display

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

@ -79,6 +79,9 @@ go_subdir_import.multicpptest:
TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
$(LANGUAGE)$(VARIANT)_cpp; \ $(LANGUAGE)$(VARIANT)_cpp; \
done done
if $(GOGCC); then \
cp testdir/go_subdir_import/*.@OBJEXT@ .; \
fi
$(run_multi_testcase) $(run_multi_testcase)
# Runs the testcase. # Runs the testcase.

2
Source/Modules/go.cxx
View file

@ -413,7 +413,7 @@ private:
} }
if (!pkgpath_option) { if (!pkgpath_option) {
Append(go_prefix, "."); Append(go_prefix, ".");
Append(go_prefix, package); Append(go_prefix, getModuleName(package));
} }
} }