From 67f052121ed47f23ea613043191ad654702560aa Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Fri, 30 May 2025 12:22:23 -0400 Subject: [PATCH] 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 LUCI-TryBot-Result: Go LUCI Reviewed-by: Michael Pratt Reviewed-by: Dmitri Shuralyov --- src/cmd/distpack/pack.go | 2 +- src/cmd/go/internal/work/gc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/distpack/pack.go b/src/cmd/distpack/pack.go index 8e0b58af21..4f14210e5f 100644 --- 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 70d22580a3..39a1f5f74c 100644 --- 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 { -- 2.50.0