From: Bryan C. Mills <bcmills@google.com>
Date: Thu, 8 Nov 2018 14:46:24 +0000 (-0500)
Subject: cmd/go/internal/load: remove redundant assignment to BinDir
X-Git-Tag: go1.12beta1~220
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=aab0b704d88b7dad10c767ad941619d59887203c;p=gostls13.git

cmd/go/internal/load: remove redundant assignment to BinDir

This assignment became a no-op in CL 36196, where both it and the
preceding assignment were changed to cfg.GOROOTbin (from gorootBin and
gobin respectively).

Change-Id: If74969c4cc3ffc5d8394ff9d8e8bcec9e0a4e3b0
Reviewed-on: https://go-review.googlesource.com/c/151561
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
---

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index 72a3d70607..616adcc57a 100644
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -1769,9 +1769,6 @@ func loadPackage(arg string, stk *ImportStack) *Package {
 		bp.ImportPath = arg
 		bp.Goroot = true
 		bp.BinDir = cfg.GOROOTbin
-		if cfg.GOROOTbin != "" {
-			bp.BinDir = cfg.GOROOTbin
-		}
 		bp.Root = cfg.GOROOT
 		bp.SrcRoot = cfg.GOROOTsrc
 		p := new(Package)