diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-24 19:50:31 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-24 19:50:31 +0000 |
| commit | 39eba414eb09b62b3c2ac7a7b904c17b1047eeaa (patch) | |
| tree | 278377d41dceea14428baa5d9f4bef9167baf464 /gotools | |
| parent | 82034000d47240839c7080d1dcaaa6c75d76c442 (diff) | |
| download | gcc-39eba414eb09b62b3c2ac7a7b904c17b1047eeaa.tar.gz | |
PR go/65462
cmd: Fix dependencies for 'go get' with gccgo
Problem described in GCC BZ 65462.
Generate the list of the standard GO package names based on what was built into libgo in the libgo Makefile.
Change the var name from reqPkgSrc to reqStdPkgSrc to clarify it only affects standard GO packages.
Skip the attempted loading of a package only if it is a standard GO package and the flag is set indicating its source is not required to be available.
This requires a corresponding change to gotools to build and link in the new file containing the list of standard GO package names that was generated by the libgo Makefile.
gotools/:
PR go/65462
* Makefile.am (go_cmd_go_files): Add $(libgodir)/zstdpkglist.go.
* Makefile.in: Rebuild.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221643 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gotools')
| -rw-r--r-- | gotools/ChangeLog | 6 | ||||
| -rw-r--r-- | gotools/Makefile.am | 3 | ||||
| -rw-r--r-- | gotools/Makefile.in | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog index fbe4d74d500..8eceb18e518 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,9 @@ +2015-03-24 Ian Lance Taylor <iant@google.com> + + PR go/65462 + * Makefile.am (go_cmd_go_files): Add $(libgodir)/zstdpkglist.go. + * Makefile.in: Rebuild. + 2015-03-12 Ian Lance Taylor <iant@google.com> * Makefile.am (GOLINK): Add GOCFLAGS. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index 9d3ca22346c..7fb0f75c297 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -67,7 +67,8 @@ go_cmd_go_files = \ $(cmdsrcdir)/go/tool.go \ $(cmdsrcdir)/go/vcs.go \ $(cmdsrcdir)/go/version.go \ - $(cmdsrcdir)/go/vet.go + $(cmdsrcdir)/go/vet.go \ + $(libgodir)/zstdpkglist.go go_cmd_gofmt_files = \ $(cmdsrcdir)/gofmt/doc.go \ diff --git a/gotools/Makefile.in b/gotools/Makefile.in index c370157da47..d08a597a85c 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -257,7 +257,8 @@ go_cmd_go_files = \ $(cmdsrcdir)/go/tool.go \ $(cmdsrcdir)/go/vcs.go \ $(cmdsrcdir)/go/version.go \ - $(cmdsrcdir)/go/vet.go + $(cmdsrcdir)/go/vet.go \ + $(libgodir)/zstdpkglist.go go_cmd_gofmt_files = \ $(cmdsrcdir)/gofmt/doc.go \ @@ -518,8 +519,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 \ |