From cfb4e9bc4ae957dba63cb2ee5e020fcd25d553fd Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Fri, 30 May 2025 12:53:42 -0400 Subject: cmd/dist: don't install tools that won't be shipped in distribution We shouldn't be installing these tools because we will remove them in distpack. Installing the tools will also prevent us from testing what happens when the tools are missing. The changes below this on the stack, CL 677775 (cmd/doc: build cmd/doc directly into the go command) and CL 677636 (cmd/go/internal/cfg: fix GOROOT setting when forcing host config) are needed for this change to pass tests. The doc change is being done so we preserve the properties in the tests that doc can be invoked without doing a build. It's not strictly necessary (we could just remove the tests) but it's nice to have. The GOROOT setting is a significant bug in switching the configuration to host mode: the value of GOROOT wasn't being reset, which caused issues for go commands built with trimpath, because runtime.GOROOT wouldn't have the correct goroot value. For #71867 Change-Id: I4181711ba117066b7d62d7d013ad4b186871cfb7 Reviewed-on: https://go-review.googlesource.com/c/go/+/677558 Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Reviewed-by: Michael Matloob --- src/cmd/distpack/pack.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/cmd/distpack') diff --git a/src/cmd/distpack/pack.go b/src/cmd/distpack/pack.go index 4f14210e5f..27f73e593c 100644 --- a/src/cmd/distpack/pack.go +++ b/src/cmd/distpack/pack.go @@ -171,6 +171,7 @@ func main() { switch strings.TrimSuffix(path.Base(name), ".exe") { default: return false + // Keep in sync with toolsIncludedInDistpack in cmd/dist/build.go. case "asm", "cgo", "compile", "cover", "link", "preprofile", "vet": } } @@ -179,6 +180,7 @@ func main() { // Add go and gofmt to bin, using cross-compiled binaries // if this is a cross-compiled distribution. + // Keep in sync with binExesIncludedInDistpack in cmd/dist/build.go. binExes := []string{ "go", "gofmt", -- cgit v1.3