From: Matthew Dempsky <mdempsky@google.com>
Date: Fri, 8 Oct 2021 18:23:38 +0000 (-0700)
Subject: cmd/cgo: use "!compiler_bootstrap" tag instead of "go1.18"
X-Git-Tag: go1.18beta1~967
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b9e1e1ba3d44069ce0b0564abab1b130ed120539;p=gostls13.git

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>
---

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