diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-02-15 17:06:57 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-03-11 14:22:02 +0000 |
| commit | fd080ea3bcc2b170b787b38ab7920d170ca65682 (patch) | |
| tree | d3d2f03ca5f58817ef9c8f72c80bba0530fe761d /src/cmd/go/internal/modload/build.go | |
| parent | 1c2d4da10f6edf9a83fb0cffaaf9f631f462d26b (diff) | |
| download | go-fd080ea3bcc2b170b787b38ab7920d170ca65682.tar.gz go-fd080ea3bcc2b170b787b38ab7920d170ca65682.zip | |
cmd/go: resolve non-standard imports from within GOROOT/src using vendor directories
Updates #30228
Fixes #26924
Change-Id: Ie625c64721559c7633396342320536396cd1fcf5
Reviewed-on: https://go-review.googlesource.com/c/go/+/164621
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/build.go')
| -rw-r--r-- | src/cmd/go/internal/modload/build.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/cmd/go/internal/modload/build.go b/src/cmd/go/internal/modload/build.go index 4d4e512ef5..25303ce59a 100644 --- a/src/cmd/go/internal/modload/build.go +++ b/src/cmd/go/internal/modload/build.go @@ -38,9 +38,6 @@ func findStandardImportPath(path string) string { if goroot.IsStandardPackage(cfg.GOROOT, cfg.BuildContext.Compiler, path) { return filepath.Join(cfg.GOROOT, "src", path) } - if goroot.IsStandardPackage(cfg.GOROOT, cfg.BuildContext.Compiler, "vendor/"+path) { - return filepath.Join(cfg.GOROOT, "src/vendor", path) - } } return "" } |