cmd/distpack: don't keep the pack tool

This was an oversight: the pack tool isn't actually used in builds.

For #71867

Change-Id: Ib1f1cce0b574cf1d2c1002b2f2ab9ef9d750d0fb
Reviewed-on: https://go-review.googlesource.com/c/go/+/677557
Reviewed-by: Michael Matloob <matloob@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

diff --git a/src/cmd/distpack/pack.go b/src/cmd/distpack/pack.go
index 8e0b58af216a342342d215946b374e87a90a8973..4f14210e5f2b8e207b36180ca2d851044bb15a53 100644 (file)
--- a/src/cmd/distpack/pack.go
+++ b/src/cmd/distpack/pack.go
@@ -171,7 +171,7 @@ func main() {
                        switch strings.TrimSuffix(path.Base(name), ".exe") {
                        default:
                                return false
-                       case "asm", "cgo", "compile", "cover", "link", "pack", "preprofile", "vet":
+                       case "asm", "cgo", "compile", "cover", "link", "preprofile", "vet":
                        }
                }
                return true

diff --git a/src/cmd/go/internal/work/gc.go b/src/cmd/go/internal/work/gc.go
index 70d22580a3e147a6be418cd6aa6edbab1e05648e..39a1f5f74c228c2cb8045632eff539c2d98e6e3c 100644 (file)
--- a/src/cmd/go/internal/work/gc.go
+++ b/src/cmd/go/internal/work/gc.go
@@ -482,7 +482,7 @@ func (gcToolchain) pack(b *Builder, a *Action, afile string, ofiles []string) er
        p := a.Package
        sh := b.Shell(a)
        if cfg.BuildN || cfg.BuildX {
-               cmdline := str.StringList(base.Tool("pack"), "r", absAfile, absOfiles)
+               cmdline := str.StringList("go", "tool", "pack", "r", absAfile, absOfiles)
                sh.ShowCmd(p.Dir, "%s # internal", joinUnambiguously(cmdline))
        }
        if cfg.BuildN {