Skip to content

Commit

Permalink
[dev.boringcrypto] all: convert +build to //go:build lines in boring-…
Browse files Browse the repository at this point in the history
…specific files

This makes the latest Go 1.18 cmd/dist happier.

Change-Id: If1894ce4f60a0b604a2bd889974ddb16c405e0c7
Reviewed-on: https://go-review.googlesource.com/c/go/+/359474
Trust: Russ Cox <rsc@golang.org>
Trust: Damien Neil <dneil@google.com>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
  • Loading branch information
rsc committed Oct 28, 2021
1 parent 2840ccb commit 69d5e46
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 28 deletions.
1 change: 1 addition & 0 deletions src/crypto/boring/notboring_test.go
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build !boringcrypto
// +build !boringcrypto

package boring_test
Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/aes.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/boring.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/ecdsa.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/hmac.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
1 change: 1 addition & 0 deletions src/crypto/internal/boring/notboring.go
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build !linux || !amd64 || !cgo || android || cmd_go_bootstrap || msan
// +build !linux !amd64 !cgo android cmd_go_bootstrap msan

package boring
Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/rand.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/rsa.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
6 changes: 2 additions & 4 deletions src/crypto/internal/boring/sha.go
Expand Up @@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build linux,amd64
// +build !android
// +build !cmd_go_bootstrap
// +build !msan
//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
// +build linux,amd64,!android,!cmd_go_bootstrap,!msan

package boring

Expand Down
1 change: 1 addition & 0 deletions src/crypto/internal/boring/sig/sig_other.s
Expand Up @@ -7,6 +7,7 @@
// search a particular binary to see if they are present.
// On other platforms (those using this source file), they don't.

//go:build !amd64
// +build !amd64

TEXT ·BoringCrypto(SB),$0
Expand Down
1 change: 1 addition & 0 deletions src/crypto/sha1/boring.go
Expand Up @@ -6,6 +6,7 @@
// cmd/internal/boring is not even imported, so that we don't
// have to maintain changes to cmd/dist's deps graph.

//go:build !cmd_go_bootstrap
// +build !cmd_go_bootstrap

package sha1
Expand Down
1 change: 1 addition & 0 deletions src/crypto/sha1/notboring.go
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build cmd_go_bootstrap
// +build cmd_go_bootstrap

package sha1
Expand Down

0 comments on commit 69d5e46

Please sign in to comment.