Skip to content

Commit 49fb2f8

Browse files
committed
Missing changes for rev 12123 to fix 'make partialcheck' for go
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12138 626c5289-ae23-0410-ae9c-e8d60b6d4f22
1 parent 95a3eb5 commit 49fb2f8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Examples/Makefile.in

+10-10
Original file line numberDiff line numberDiff line change
@@ -1171,10 +1171,10 @@ go: $(SRCS)
11711171
$(SWIG) -go $(GOSWIGARG) $(SWIGOPT) $(INTERFACEPATH)
11721172
$(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES)
11731173
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
1174-
$(GO) -I . $(GOCOMPILEARG) $(GOSRCS)
1174+
$(COMPILETOOL) $(GO) -I . $(GOCOMPILEARG) $(GOSRCS)
11751175
if ! $(GOGCC) ; then \
1176-
$(GOC) -I $${GOROOT}/pkg/$${GOOS}_$${GOARCH} $(GOCSRCS) && \
1177-
gopack grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \
1176+
$(COMPILETOOL) $(GOC) -I $${GOROOT}/pkg/$${GOOS}_$${GOARCH} $(GOCSRCS) && \
1177+
$(COMPILETOOL) gopack grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \
11781178
fi
11791179

11801180
# ----------------------------------------------------------------
@@ -1185,11 +1185,11 @@ go_cpp: $(SRCS)
11851185
$(SWIG) -go -c++ $(GOSWIGARG) $(SWIGOPT) $(INTERFACEPATH)
11861186
$(CXX) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES)
11871187
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
1188-
$(GO) -I . $(GOCOMPILEARG) $(GOSRCS)
1188+
$(COMPILETOOL) $(GO) -I . $(GOCOMPILEARG) $(GOSRCS)
11891189
if ! $(GOGCC) ; then \
1190-
$(GOC) -I $${GOROOT}/pkg/$${GOOS}_$${GOARCH} $(GOCSRCS) && \
1191-
gopack grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \
1192-
else true; fi
1190+
$(COMPILETOOL) $(GOC) -I $${GOROOT}/pkg/$${GOOS}_$${GOARCH} $(GOCSRCS) && \
1191+
$(COMPILETOOL) gopack grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \
1192+
fi
11931193

11941194
# -----------------------------------------------------------------
11951195
# Running a Go example
@@ -1198,11 +1198,11 @@ go_cpp: $(SRCS)
11981198
go_run: runme.go
11991199
$(GO) $(GOCOMPILEARG) runme.go
12001200
if $(GOGCC) ; then \
1201-
$(GO) -o runme runme.@OBJEXT@ $(GOGCCOBJS) $(LIBPREFIX)$(TARGET)$(SO); \
1201+
$(COMPILETOOL) $(GO) -o runme runme.@OBJEXT@ $(GOGCCOBJS) $(LIBPREFIX)$(TARGET)$(SO); \
12021202
else \
1203-
$(GOLD) -r $${GOROOT}/pkg/$${GOOS}_$${GOARCH}:. -o runme runme.$(GOOBJEXT); \
1203+
$(COMPILETOOL) $(GOLD) -r $${GOROOT}/pkg/$${GOOS}_$${GOARCH}:. -o runme runme.$(GOOBJEXT); \
12041204
fi
1205-
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ./runme
1205+
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme
12061206

12071207
# -----------------------------------------------------------------
12081208
# Cleaning the Go examples

0 commit comments

Comments
 (0)