cmd/go: remove unused var BuildToolchainLinker and BuildToolchainCompiler

Change-Id: I4bb855f6ada5c550a46f69313a2f47631bf657ca
GitHub-Last-Rev: 2af07f9d7bda0de31b61d434635cd1c2c568af06
GitHub-Pull-Request: golang/go#65838
Reviewed-on: https://go-review.googlesource.com/c/go/+/565517
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>

diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
index 948bceab32fdc3b2a4d8bd71db7abb3c5487ee6d..58432335e4106fa177d6ed634485db0718579db6 100644 (file)
--- a/src/cmd/go/internal/cfg/cfg.go
+++ b/src/cmd/go/internal/cfg/cfg.go
@@ -64,33 +64,31 @@ func ToolExeSuffix() string {
 
 // These are general "build flags" used by build and other commands.
 var (
-       BuildA                 bool     // -a flag
-       BuildBuildmode         string   // -buildmode flag
-       BuildBuildvcs          = "auto" // -buildvcs flag: "true", "false", or "auto"
-       BuildContext           = defaultContext()
-       BuildMod               string                  // -mod flag
-       BuildModExplicit       bool                    // whether -mod was set explicitly
-       BuildModReason         string                  // reason -mod was set, if set by default
-       BuildLinkshared        bool                    // -linkshared flag
-       BuildMSan              bool                    // -msan flag
-       BuildASan              bool                    // -asan flag
-       BuildCover             bool                    // -cover flag
-       BuildCoverMode         string                  // -covermode flag
-       BuildCoverPkg          []string                // -coverpkg flag
-       BuildN                 bool                    // -n flag
-       BuildO                 string                  // -o flag
-       BuildP                 = runtime.GOMAXPROCS(0) // -p flag
-       BuildPGO               string                  // -pgo flag
-       BuildPkgdir            string                  // -pkgdir flag
-       BuildRace              bool                    // -race flag
-       BuildToolexec          []string                // -toolexec flag
-       BuildToolchainName     string
-       BuildToolchainCompiler func() string
-       BuildToolchainLinker   func() string
-       BuildTrimpath          bool // -trimpath flag
-       BuildV                 bool // -v flag
-       BuildWork              bool // -work flag
-       BuildX                 bool // -x flag
+       BuildA             bool     // -a flag
+       BuildBuildmode     string   // -buildmode flag
+       BuildBuildvcs      = "auto" // -buildvcs flag: "true", "false", or "auto"
+       BuildContext       = defaultContext()
+       BuildMod           string                  // -mod flag
+       BuildModExplicit   bool                    // whether -mod was set explicitly
+       BuildModReason     string                  // reason -mod was set, if set by default
+       BuildLinkshared    bool                    // -linkshared flag
+       BuildMSan          bool                    // -msan flag
+       BuildASan          bool                    // -asan flag
+       BuildCover         bool                    // -cover flag
+       BuildCoverMode     string                  // -covermode flag
+       BuildCoverPkg      []string                // -coverpkg flag
+       BuildN             bool                    // -n flag
+       BuildO             string                  // -o flag
+       BuildP             = runtime.GOMAXPROCS(0) // -p flag
+       BuildPGO           string                  // -pgo flag
+       BuildPkgdir        string                  // -pkgdir flag
+       BuildRace          bool                    // -race flag
+       BuildToolexec      []string                // -toolexec flag
+       BuildToolchainName string
+       BuildTrimpath      bool // -trimpath flag
+       BuildV             bool // -v flag
+       BuildWork          bool // -work flag
+       BuildX             bool // -x flag
 
        ModCacheRW bool   // -modcacherw flag
        ModFile    string // -modfile flag
@@ -181,8 +179,6 @@ func defaultContext() build.Context {
 
 func init() {
        SetGOROOT(Getenv("GOROOT"), false)
-       BuildToolchainCompiler = func() string { return "missing-compiler" }
-       BuildToolchainLinker = func() string { return "missing-linker" }
 }
 
 // SetGOROOT sets GOROOT and associated variables to the given values.

diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
index 408edb51193d35e015e2cc6bc2f09de93ce748d7..ccfb4622e25a449b2953260695f9d5f62ebd230e 100644 (file)
--- a/src/cmd/go/internal/work/build.go
+++ b/src/cmd/go/internal/work/build.go
@@ -276,8 +276,6 @@ func (c buildCompiler) Set(value string) error {
                return fmt.Errorf("unknown compiler %q", value)
        }
        cfg.BuildToolchainName = value
-       cfg.BuildToolchainCompiler = BuildToolchain.compiler
-       cfg.BuildToolchainLinker = BuildToolchain.linker
        cfg.BuildContext.Compiler = value
        return nil
 }