diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2021-10-08 11:23:38 -0700 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2021-10-08 19:19:09 +0000 |
| commit | b9e1e1ba3d44069ce0b0564abab1b130ed120539 (patch) | |
| tree | 32b5d00e4d8c066bceeb2c032b57af9944de0cdc /src/cmd/cgo | |
| parent | d480b5c790196c615213f2308d6b7b975eb99ff9 (diff) | |
| download | go-b9e1e1ba3d44069ce0b0564abab1b130ed120539.tar.gz go-b9e1e1ba3d44069ce0b0564abab1b130ed120539.zip | |
cmd/cgo: use "!compiler_bootstrap" tag instead of "go1.18"
The illumos builder is using a Go 1.18 prerelease toolchain for
bootstrapping, which doesn't have ast.IndexListExpr. But we can
instead check for the "compiler_bootstrap" build tag that's already
used for distinguishing binaries built for toolchain1.
Fixes #48863.
Change-Id: I87b672322eee22a60ab8d0bb3be5f76cffc97545
Reviewed-on: https://go-review.googlesource.com/c/go/+/354695
Trust: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/cgo')
| -rw-r--r-- | src/cmd/cgo/ast_go1.go | 4 | ||||
| -rw-r--r-- | src/cmd/cgo/ast_go118.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/cgo/ast_go1.go b/src/cmd/cgo/ast_go1.go index cf6d99f64a..f52bf00d7c 100644 --- a/src/cmd/cgo/ast_go1.go +++ b/src/cmd/cgo/ast_go1.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !go1.18 -// +build !go1.18 +//go:build compiler_bootstrap +// +build compiler_bootstrap package main diff --git a/src/cmd/cgo/ast_go118.go b/src/cmd/cgo/ast_go118.go index 2e3ce27521..db0108ed72 100644 --- a/src/cmd/cgo/ast_go118.go +++ b/src/cmd/cgo/ast_go118.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.18 -// +build go1.18 +//go:build !compiler_bootstrap +// +build !compiler_bootstrap package main |