summaryrefslogtreecommitdiff
path: root/libgo/Makefile.in
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-09-21 12:45:43 -0700
committerIan Lance Taylor <iant@golang.org>2020-09-21 14:11:01 -0700
commit68402af1c68301c6bc852ddba6c63966ed706178 (patch)
tree1839ccee4767ad5416607fe017401f148274cf37 /libgo/Makefile.in
parent05193687dde2e5a6337164182a1946b584acfada (diff)
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/Makefile.in')
-rw-r--r--libgo/Makefile.in2
1 files changed, 1 insertions, 1 deletions
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) $@