diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2019-03-25 17:39:11 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-03-27 04:58:23 +0000 |
| commit | 39a51a4b0d698491baaa252e21be2a51516379ea (patch) | |
| tree | e14c5dce3e27e69783779ae5b81a0668a36ab5d7 /src/cmd/go/internal/load/pkg.go | |
| parent | f0e0be6e9020caff0b44e0dcb44c8b2e707710f0 (diff) | |
| download | go-39a51a4b0d698491baaa252e21be2a51516379ea.tar.gz go-39a51a4b0d698491baaa252e21be2a51516379ea.zip | |
sort, internal/reflectlite: flesh out reflectlite enough for use by sort
Now the net package is back to no longer depending on unicode. And lock that in
with a test.
Fixes #30440
Change-Id: I18b89b02f7d96488783adc07308da990f505affd
Reviewed-on: https://go-review.googlesource.com/c/go/+/169137
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/go/internal/load/pkg.go')
| -rw-r--r-- | src/cmd/go/internal/load/pkg.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go index 3827d3184e..cc81cc0317 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -969,6 +969,13 @@ func disallowInternal(srcDir string, importer *Package, importerPath string, p * return p } + // The sort package depends on internal/reflectlite, but during bootstrap + // the path rewriting causes the normal internal checks to fail. + // Instead, just ignore the internal rules during bootstrap. + if p.Standard && strings.HasPrefix(importerPath, "bootstrap/") { + return p + } + // The stack includes p.ImportPath. // If that's the only thing on the stack, we started // with a name given on the command line, not an |