summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2018-05-09 21:49:47 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-05-09 21:49:47 +0000
commit2f55f4aa6c403c58480cc9040b1c17238c17a54f (patch)
treedb15ce3c24c21d5a4a060f2342339882ef0cc014 /gotools
parentf2410266a00a3ebd6db07007aa82333b4f6ee6c2 (diff)
go/build, cmd/go: update to match recent changes to gc
Several recent changes to the gc version of cmd/go improve the gofrontend support. These changes are partially copies of existing gofrontend differences, and partially new code. This CL makes the gofrontend match the upstream code. The changes included here come from: https://golang.org/cl/111575 https://golang.org/cl/111595 https://golang.org/cl/111635 https://golang.org/cl/111636 For the record, the following recent gc changes are based on code already present in the gofrontend repo: https://golang.org/cl/110915 https://golang.org/cl/111615 For the record, a gc change, partially based on earlier gofrontend work, also with new gc code, was already copied to gofrontend repo in CL 111099: https://golang.org/cl/111097 This moves the generated list of standard library packages from cmd/go/internal/load to go/build. Reviewed-on: https://go-review.googlesource.com/112475 gotools/: * Makefile.am (check-go-tool): Don't copy zstdpkglist.go. * Makefile.in: Rebuild. From-SVN: r260097
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog5
-rw-r--r--gotools/Makefile.am1
-rw-r--r--gotools/Makefile.in3
3 files changed, 6 insertions, 3 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index cac11df05ac..0e671860435 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-09 Ian Lance Taylor <iant@golang.org>
+
+ * Makefile.am (check-go-tool): Don't copy zstdpkglist.go.
+ * Makefile.in: Rebuild.
+
2018-05-04 Ian Lance Taylor <iant@golang.org>
PR go/85630
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index ba5f283e33f..06be89d582a 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -232,7 +232,6 @@ check-go-tool: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
$(MKDIR_P) check-go-dir/src/cmd/go
cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/
cp -r $(cmdsrcdir)/go/internal check-go-dir/src/cmd/go/
- cp $(libgodir)/zstdpkglist.go check-go-dir/src/cmd/go/internal/load/
cp $(libgodir)/zdefaultcc.go check-go-dir/src/cmd/go/internal/cfg/
cp -r $(cmdsrcdir)/go/testdata check-go-dir/src/cmd/go/
cp -r $(cmdsrcdir)/internal check-go-dir/src/cmd/
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index 8e60e9f26ef..503ec4eb446 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@install-exec-local:
@NATIVE_FALSE@uninstall-local:
+@NATIVE_FALSE@install-exec-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
@@ -811,7 +811,6 @@ mostlyclean-local:
@NATIVE_TRUE@ $(MKDIR_P) check-go-dir/src/cmd/go
@NATIVE_TRUE@ cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/
@NATIVE_TRUE@ cp -r $(cmdsrcdir)/go/internal check-go-dir/src/cmd/go/
-@NATIVE_TRUE@ cp $(libgodir)/zstdpkglist.go check-go-dir/src/cmd/go/internal/load/
@NATIVE_TRUE@ cp $(libgodir)/zdefaultcc.go check-go-dir/src/cmd/go/internal/cfg/
@NATIVE_TRUE@ cp -r $(cmdsrcdir)/go/testdata check-go-dir/src/cmd/go/
@NATIVE_TRUE@ cp -r $(cmdsrcdir)/internal check-go-dir/src/cmd/