diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2021-10-04 16:42:13 -0700 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2021-10-05 00:29:40 +0000 |
| commit | 81b7ec1ad5b50b8e73a63b44d8c2538154def535 (patch) | |
| tree | e64823d41eefa0dbc4a29026fd29678cb49d4758 /src/cmd/dist | |
| parent | e5f6d8d00c3d0c1f77665f493109925c831e7cf8 (diff) | |
| download | go-81b7ec1ad5b50b8e73a63b44d8c2538154def535.tar.gz go-81b7ec1ad5b50b8e73a63b44d8c2538154def535.zip | |
cmd/dist: omit cmd/cgo from toolchain1
We don't need cmd/cgo for building go_bootstrap or toolchain2, so skip
building it as part of toolchain1.
This allows cmd/cgo to assume a current go/ast; e.g., that
ast.IndexListExpr exists (needed for next CL).
Change-Id: I642bba780bf273e6ea9c6e7c5d5d7ccfe86bf462
Reviewed-on: https://go-review.googlesource.com/c/go/+/353884
Trust: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/dist')
| -rw-r--r-- | src/cmd/dist/build.go | 2 | ||||
| -rw-r--r-- | src/cmd/dist/buildtool.go | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 39f016e315..dca5464e56 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -1359,7 +1359,7 @@ func cmdbootstrap() { } // To recap, so far we have built the new toolchain - // (cmd/asm, cmd/cgo, cmd/compile, cmd/link) + // (cmd/asm, cmd/compile, cmd/link) // using Go 1.4's toolchain and go command. // Then we built the new go command (as go_bootstrap) // using the new toolchain and our own build logic (above). diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go index 320c62f850..8d1c914f30 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -33,7 +33,6 @@ import ( var bootstrapDirs = []string{ "cmd/asm", "cmd/asm/internal/...", - "cmd/cgo", "cmd/compile", "cmd/compile/internal/...", "cmd/internal/archive", @@ -102,6 +101,7 @@ func bootstrapBuildTools() { mkbuildcfg(pathf("%s/src/internal/buildcfg/zbootstrap.go", goroot)) mkobjabi(pathf("%s/src/cmd/internal/objabi/zbootstrap.go", goroot)) + mkzdefaultcc("", pathf("%s/src/cmd/cgo/zdefaultcc.go", goroot)) // Use $GOROOT/pkg/bootstrap as the bootstrap workspace root. // We use a subdirectory of $GOROOT/pkg because that's the @@ -134,12 +134,6 @@ func bootstrapBuildTools() { } xmkdirall(dst) - if path == "cmd/cgo" { - // Write to src because we need the file both for bootstrap - // and for later in the main build. - mkzdefaultcc("", pathf("%s/zdefaultcc.go", src)) - mkzdefaultcc("", pathf("%s/zdefaultcc.go", dst)) - } return nil } |