mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-18 06:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

libgo: don't put golang.org packages in zstdpkglist.go

Browse Source 
This ensures that internal/goroot.IsStandardPackage does not treat
golang.org packages as being in the standard library.

For 
Fixes 

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/256319
This commit is contained in:
Ian Lance Taylor 2020-09-21 12:45:43 -07:00
parent 05193687dd
commit 68402af1c6
3 changed files with 3 additions and 3 deletions
gcc/go/gofrontend
MERGE
libgo
Makefile.amMakefile.in

2
gcc/go/gofrontend/MERGE

@ -1,4 +1,4 @@
6fd6418efb983827717f648a11bb5ca6fe93af30
f2706d92d9560657333682a3de548f1f98e9f9b0
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

2
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) $@

2
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) $@