aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2022-04-27 10:04:55 -0400
committerRuss Cox <rsc@golang.org>2022-04-29 14:23:25 +0000
commit509776be5dca8d7ca47cc6ef2e4fc452eb99dc96 (patch)
tree9212e13e20816a5c0d79420c46a9f318519ce76b
parentf4c0f42f99476ed1621527f04364610ed2acf6bb (diff)
downloadgo-509776be5dca8d7ca47cc6ef2e4fc452eb99dc96.tar.gz
go-509776be5dca8d7ca47cc6ef2e4fc452eb99dc96.zip
[dev.boringcrypto] cmd/dist: default to use of boringcrypto
The dev.boringcrypto branch has historically forced use of boringcrypto with no additional configuration flags. The previous CL undid that. This CL redoes it, so that direct uses of dev.boringcrypto don't lapse unexpectedly into not having boringcrypto enabled. When dev.boringcrypto is merged into master, we will undo this change as part of the merge, so that the only final difference between master and dev.boringcrypto will be this CL. For #51940. Change-Id: I816593a0b30b4e71093a7da9451bae7807d7167e Reviewed-on: https://go-review.googlesource.com/c/go/+/402597 Run-TryBot: Russ Cox <rsc@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com> TryBot-Result: Gopher Robot <gobot@golang.org>
-rw-r--r--src/cmd/dist/build.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index bbaf595421..519f33afeb 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -199,6 +199,13 @@ func xinit() {
goexperiment = os.Getenv("GOEXPERIMENT")
// TODO(mdempsky): Validate known experiments?
+ if !strings.Contains(goexperiment, "boringcrypto") {
+ if goexperiment != "" {
+ goexperiment += ","
+ }
+ goexperiment += "boringcrypto"
+ }
+
gogcflags = os.Getenv("BOOT_GO_GCFLAGS")
goldflags = os.Getenv("BOOT_GO_LDFLAGS")