From 509776be5dca8d7ca47cc6ef2e4fc452eb99dc96 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 27 Apr 2022 10:04:55 -0400 Subject: [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 Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot --- src/cmd/dist/build.go | 7 +++++++ 1 file changed, 7 insertions(+) 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") -- cgit v1.2.3-54-g00ecf