From: Cherry Zhang <cherryyz@google.com>
Date: Thu, 18 Feb 2021 19:18:53 +0000 (-0500)
Subject: cmd/dist: match goexperiment.regabi tag when GOEXPERIMENT is on
X-Git-Tag: go1.17beta1~1454
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f113e9a14f08d23be78f75050185f9796a1d243f;p=gostls13.git

cmd/dist: match goexperiment.regabi tag when GOEXPERIMENT is on

Change-Id: I5e4347dde6dcb49cd96608e4f67e54c7b3050bc2
Reviewed-on: https://go-review.googlesource.com/c/go/+/293851
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
---

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index c02b92818c..07ede42574 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -982,6 +982,11 @@ func matchtag(tag string) bool {
 		}
 		return !matchtag(tag[1:])
 	}
+	if os.Getenv("GOEXPERIMENT") == "regabi" && tag == "goexperiment.regabi" {
+		// TODO: maybe we can handle GOEXPERIMENT more generally.
+		// Or remove once we commit to regabi (#40724).
+		return true
+	}
 	return tag == "gc" || tag == goos || tag == goarch || tag == "cmd_go_bootstrap" || tag == "go1.1" ||
 		(goos == "android" && tag == "linux") ||
 		(goos == "illumos" && tag == "solaris") ||