From b9e1e1ba3d44069ce0b0564abab1b130ed120539 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Fri, 8 Oct 2021 11:23:38 -0700 Subject: [PATCH] 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 Run-TryBot: Matthew Dempsky TryBot-Result: Go Bot Reviewed-by: Ian Lance Taylor --- src/cmd/cgo/ast_go1.go | 4 ++-- 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 cf6d99f64a0..f52bf00d7cb 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 2e3ce275212..db0108ed726 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