Skip to content

Commit

Permalink
crypto/x509: mark root_darwin_armx.go as cgo-only
Browse files Browse the repository at this point in the history
This allows running a cross-compile like
	GOOS=darwin GOARCH=arm go build std
to check that everything builds.

Otherwise there is a redefinition error because both
root_nocgo_darwin.go and root_darwin_armx.go
supply initSystemRoots.

Change-Id: Ic95976b2b698d28c629bfc93d8dac0048b023578
Reviewed-on: https://go-review.googlesource.com/12897
Reviewed-by: Ian Lance Taylor <iant@golang.org>
  • Loading branch information
rsc committed Jul 30, 2015
1 parent 48b4263 commit ab714a7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/crypto/x509/root_darwin_arm_gen.go
Expand Up @@ -178,6 +178,7 @@ const header = `
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build cgo
// +build darwin
// +build arm arm64
Expand Down
1 change: 1 addition & 0 deletions src/crypto/x509/root_darwin_armx.go
Expand Up @@ -4,6 +4,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build cgo
// +build darwin
// +build arm arm64 ios

Expand Down

0 comments on commit ab714a7

Please sign in to comment.