[dev.boringcrypto] all: merge master into dev.boringcrypto

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

diff --git a/src/go/build/build.go b/src/go/build/build.go
index eb47ffe2859c4fa84a905cdfe6afb70c93e473fc..b0decbba9f514db3fea79803040f7fba7f5bd4d7 100644 (file)
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1872,6 +1872,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)
@@ -1899,6 +1900,10 @@ func (ctxt *Context) matchTag(name string, allTags map[string]bool) bool {
        if ctxt.GOOS == "ios" && name == "darwin" {
                return true
        }
+       // Let applications know that the Go+BoringCrypto toolchain is in use.
+       if name == "boringcrypto" {
+               return true
+       }
 
        // other tags
        for _, tag := range ctxt.BuildTags {