all: REVERSE MERGE dev.boringcrypto (cdcb4b6) into master

[gostls13.git] / src / go / build / build.go

diff --git a/src/go/build/build.go b/src/go/build/build.go
index cf8886c7871e0e2fe36d359282b5bce5d8caf0b1..836e279d924f2798bf46080eeda104a34380e955 100644 (file)
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1876,6 +1876,7 @@ func (ctxt *Context) eval(x constraint.Expr, allTags map[string]bool) bool {
 //     cgo (if cgo is enabled)
 //     $GOOS
 //     $GOARCH
+//     boringcrypto
 //     ctxt.Compiler
 //     linux (if GOOS = android)
 //     solaris (if GOOS = illumos)
@@ -1906,6 +1907,9 @@ func (ctxt *Context) matchTag(name string, allTags map[string]bool) bool {
        if name == "unix" && unixOS[ctxt.GOOS] {
                return true
        }
+       if name == "boringcrypto" {
+               name = "goexperiment.boringcrypto" // boringcrypto is an old name for goexperiment.boringcrypto
+       }
 
        // other tags
        for _, tag := range ctxt.BuildTags {