Skip to content

Commit 67f0521

Browse files
committed
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 <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Michael Pratt <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 1947c42 commit 67f0521

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/cmd/distpack/pack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func main() {
171171
switch strings.TrimSuffix(path.Base(name), ".exe") {
172172
default:
173173
return false
174-
case "asm", "cgo", "compile", "cover", "link", "pack", "preprofile", "vet":
174+
case "asm", "cgo", "compile", "cover", "link", "preprofile", "vet":
175175
}
176176
}
177177
return true

src/cmd/go/internal/work/gc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ func (gcToolchain) pack(b *Builder, a *Action, afile string, ofiles []string) er
482482
p := a.Package
483483
sh := b.Shell(a)
484484
if cfg.BuildN || cfg.BuildX {
485-
cmdline := str.StringList(base.Tool("pack"), "r", absAfile, absOfiles)
485+
cmdline := str.StringList("go", "tool", "pack", "r", absAfile, absOfiles)
486486
sh.ShowCmd(p.Dir, "%s # internal", joinUnambiguously(cmdline))
487487
}
488488
if cfg.BuildN {

0 commit comments

Comments
 (0)