aboutsummaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2018-09-24 21:46:21 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-09-24 21:46:21 +0000
commitdd931d9b48647e898dc80927c532ae93cc09e192 (patch)
tree71be2295cd79b8a182f6130611658db8628772d5 /gotools
parent779d8a5ad09b01428726ea5a0e6c87bd9ac3c0e4 (diff)
libgo: update to Go 1.11
Reviewed-on: https://go-review.googlesource.com/136435 gotools/: * Makefile.am (mostlyclean-local): Run chmod on check-go-dir to make sure it is writable. (check-go-tools): Likewise. (check-vet): Copy internal/objabi to check-vet-dir. * Makefile.in: Rebuild. From-SVN: r264546
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog8
-rw-r--r--gotools/Makefile.am6
-rw-r--r--gotools/Makefile.in8
3 files changed, 19 insertions, 3 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 0e671860435..afcd7a211c1 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,11 @@
+2018-09-24 Ian Lance Taylor <iant@golang.org>
+
+ * Makefile.am (mostlyclean-local): Run chmod on check-go-dir to
+ make sure it is writable.
+ (check-go-tools): Likewise.
+ (check-vet): Copy internal/objabi to check-vet-dir.
+ * Makefile.in: Rebuild.
+
2018-05-09 Ian Lance Taylor <iant@golang.org>
* Makefile.am (check-go-tool): Don't copy zstdpkglist.go.
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 06be89d582a..cb4ffe7a66f 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -123,6 +123,7 @@ MOSTLYCLEANFILES = \
*.sent
mostlyclean-local:
+ chmod -R u+w check-go-dir
rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir
if NATIVE
@@ -228,6 +229,7 @@ ECHO_ENV = PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,
# check-go-tool runs `go test cmd/go` in our environment.
check-go-tool: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
+ chmod -R u+w check-go-dir
rm -rf check-go-dir cmd_go-testlog
$(MKDIR_P) check-go-dir/src/cmd/go
cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/
@@ -297,8 +299,10 @@ check-carchive-test: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check
# check-vet runs `go test cmd/vet` in our environment.
check-vet: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
rm -rf check-vet-dir cmd_vet-testlog
- $(MKDIR_P) check-vet-dir/src/cmd
+ $(MKDIR_P) check-vet-dir/src/cmd/internal
cp -r $(cmdsrcdir)/vet check-vet-dir/src/cmd/
+ cp -r $(cmdsrcdir)/internal/objabi check-vet-dir/src/cmd/internal
+ cp $(libgodir)/objabi.go check-vet-dir/src/cmd/internal/objabi/
@abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \
abs_checkdir=`cd check-vet-dir && $(PWD_COMMAND)`; \
echo "cd check-vet-dir/src/cmd/vet && $(ECHO_ENV) GOPATH=$${abs_checkdir} $(abs_builddir)/go$(EXEEXT) test -test.short -test.timeout=$(GOTOOLS_TEST_TIMEOUT)s -test.v" > cmd_vet-testlog
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index 503ec4eb446..acadfc64016 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -637,8 +637,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@NATIVE_FALSE@uninstall-local:
@NATIVE_FALSE@install-exec-local:
+@NATIVE_FALSE@uninstall-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
@@ -744,6 +744,7 @@ s-zdefaultcc: Makefile
$(STAMP) $@
mostlyclean-local:
+ chmod -R u+w check-go-dir
rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir
@NATIVE_TRUE@go$(EXEEXT): $(go_cmd_go_files) $(LIBGOTOOL) $(LIBGODEP)
@@ -807,6 +808,7 @@ mostlyclean-local:
# check-go-tool runs `go test cmd/go` in our environment.
@NATIVE_TRUE@check-go-tool: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
+@NATIVE_TRUE@ chmod -R u+w check-go-dir
@NATIVE_TRUE@ rm -rf check-go-dir cmd_go-testlog
@NATIVE_TRUE@ $(MKDIR_P) check-go-dir/src/cmd/go
@NATIVE_TRUE@ cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/
@@ -876,8 +878,10 @@ mostlyclean-local:
# check-vet runs `go test cmd/vet` in our environment.
@NATIVE_TRUE@check-vet: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
@NATIVE_TRUE@ rm -rf check-vet-dir cmd_vet-testlog
-@NATIVE_TRUE@ $(MKDIR_P) check-vet-dir/src/cmd
+@NATIVE_TRUE@ $(MKDIR_P) check-vet-dir/src/cmd/internal
@NATIVE_TRUE@ cp -r $(cmdsrcdir)/vet check-vet-dir/src/cmd/
+@NATIVE_TRUE@ cp -r $(cmdsrcdir)/internal/objabi check-vet-dir/src/cmd/internal
+@NATIVE_TRUE@ cp $(libgodir)/objabi.go check-vet-dir/src/cmd/internal/objabi/
@NATIVE_TRUE@ @abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \
@NATIVE_TRUE@ abs_checkdir=`cd check-vet-dir && $(PWD_COMMAND)`; \
@NATIVE_TRUE@ echo "cd check-vet-dir/src/cmd/vet && $(ECHO_ENV) GOPATH=$${abs_checkdir} $(abs_builddir)/go$(EXEEXT) test -test.short -test.timeout=$(GOTOOLS_TEST_TIMEOUT)s -test.v" > cmd_vet-testlog