Fix Go version check and Go in-tree example tests

Fixes #1607
This commit is contained in:
Ian Lance Taylor 2019-08-09 14:06:45 -07:00
commit 62136ff782
2 changed files with 5 additions and 4 deletions

View file

@ -1484,7 +1484,7 @@ go: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
rm -f gopath/$(GOMOD)/src/runme/*; \
fi
if test -f $(SRCDIR)$(RUNME).go; then \
cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \
cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
fi
GOPATH=`pwd`/gopath/$(GOMOD); \
export GOPATH; \
@ -1533,7 +1533,7 @@ go_cpp: $(SRCDIR_SRCS) $(GOPATHPARENTDIR)/go.mod
rm -f gopath/$(GOMOD)/src/runme/*; \
fi
if test -f $(SRCDIR)$(RUNME).go; then \
cp $(SRCDIR)/$(RUNME).go gopath/$(GOMOD)/src/runme/; \
cp $(SRCDIR)$(RUNME).go gopath/$(GOMOD)/src/runme/; \
fi
GOPATH=`pwd`/gopath/$(GOMOD); \
export GOPATH; \