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 golang#48863. Change-Id: I87b672322eee22a60ab8d0bb3be5f76cffc97545 Reviewed-on: https://go-review.googlesource.com/c/go/+/354695 Trust: Matthew Dempsky <[email protected]> Run-TryBot: Matthew Dempsky <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
hick · Oct 8, 2021 · b9e1e1b · b9e1e1b
1 parent d480b5c
commit b9e1e1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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