diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-09-21 12:45:43 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-09-21 14:11:01 -0700 |
| commit | 68402af1c68301c6bc852ddba6c63966ed706178 (patch) | |
| tree | 1839ccee4767ad5416607fe017401f148274cf37 /libgo | |
| parent | 05193687dde2e5a6337164182a1946b584acfada (diff) | |
| download | gcc-68402af1c68301c6bc852ddba6c63966ed706178.tar.gz | |
libgo: don't put golang.org packages in zstdpkglist.go
This ensures that internal/goroot.IsStandardPackage does not treat
golang.org packages as being in the standard library.
For golang/go#41368
Fixes golang/go#41499
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/256319
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 9ce0cab9d6a..e3f08a2df39 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -620,7 +620,7 @@ s-zstdpkglist: Makefile echo 'package goroot' > zstdpkglist.go.tmp echo "" >> zstdpkglist.go.tmp echo 'var stdpkg = map[string]bool{' >> zstdpkglist.go.tmp - echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's|[a-z0-9_./]*_c\.lo||g' | sed 's|\([a-z0-9_./]*\)\.lo|"\1": true,|g' >> zstdpkglist.go.tmp + echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's|[a-z0-9_./]*_c\.lo||g' | sed 's|golang\.org/[a-z0-9_./]*\.lo||g' | sed 's|\([a-z0-9_./]*\)\.lo|"\1": true,|g' >> zstdpkglist.go.tmp echo '}' >> zstdpkglist.go.tmp $(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go $(STAMP) $@ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index b5770831556..18b1a06be41 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -2784,7 +2784,7 @@ s-zstdpkglist: Makefile echo 'package goroot' > zstdpkglist.go.tmp echo "" >> zstdpkglist.go.tmp echo 'var stdpkg = map[string]bool{' >> zstdpkglist.go.tmp - echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's|[a-z0-9_./]*_c\.lo||g' | sed 's|\([a-z0-9_./]*\)\.lo|"\1": true,|g' >> zstdpkglist.go.tmp + echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's|[a-z0-9_./]*_c\.lo||g' | sed 's|golang\.org/[a-z0-9_./]*\.lo||g' | sed 's|\([a-z0-9_./]*\)\.lo|"\1": true,|g' >> zstdpkglist.go.tmp echo '}' >> zstdpkglist.go.tmp $(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go $(STAMP) $@ |