From 4badad8d477ffd7a6b762c35bc69aed82faface7 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 28 Apr 2023 15:05:36 -0700 Subject: [PATCH] cmd/distpack: remove internal/platform/zosarch.go cmd/dist started generating that file in CL 483695. Also rearrange the list of files to remove slightly to explain better where they come from. Fixes #59889 Change-Id: I062c858596d801157e0d943e4ba2761c0547ac3a Reviewed-on: https://go-review.googlesource.com/c/go/+/490655 Auto-Submit: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Reviewed-by: Heschi Kreinick Auto-Submit: Ian Lance Taylor --- src/cmd/distpack/pack.go | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/cmd/distpack/pack.go b/src/cmd/distpack/pack.go index ffeb4a16113..55e07f88c33 100644 --- a/src/cmd/distpack/pack.go +++ b/src/cmd/distpack/pack.go @@ -5,16 +5,15 @@ // Distpack creates the tgz and zip files for a Go distribution. // It writes into GOROOT/pkg/distpack: // -// - a binary distribution (tgz or zip) for the current GOOS and GOARCH -// - a source distribution that is independent of GOOS/GOARCH -// - the module mod, info, and zip files for a distribution in module form -// (as used by GOTOOLCHAIN support in the go command). +// - a binary distribution (tgz or zip) for the current GOOS and GOARCH +// - a source distribution that is independent of GOOS/GOARCH +// - the module mod, info, and zip files for a distribution in module form +// (as used by GOTOOLCHAIN support in the go command). // // Distpack is typically invoked by the -distpack flag to make.bash. // A cross-compiled distribution for goos/goarch can be built using: // // GOOS=goos GOARCH=goarch ./make.bash -distpack -// package main import ( @@ -113,15 +112,21 @@ func main() { srcArch.Remove( "bin/**", "pkg/**", + // Generated during cmd/dist. See ../dist/build.go:/deptab. - "src/cmd/cgo/zdefaultcc.go", "src/cmd/go/internal/cfg/zdefaultcc.go", - "src/cmd/go/internal/cfg/zosarch.go", - "src/cmd/internal/objabi/zbootstrap.go", "src/go/build/zcgo.go", - "src/internal/buildcfg/zbootstrap.go", + "src/internal/platform/zosarch.go", "src/runtime/internal/sys/zversion.go", "src/time/tzdata/zzipdata.go", + + // Generated during cmd/dist by bootstrapBuildTools. + "src/cmd/cgo/zdefaultcc.go", + "src/cmd/internal/objabi/zbootstrap.go", + "src/internal/buildcfg/zbootstrap.go", + + // Generated by earlier versions of cmd/dist . + "src/cmd/go/internal/cfg/zosarch.go", ) srcArch.AddPrefix("go") testSrc(srcArch)