aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crawshaw <crawshaw@golang.org>2015-07-16 13:14:56 -0400
committerDavid Crawshaw <crawshaw@golang.org>2015-07-16 19:10:11 +0000
commit29eb7d18ed71c057bbdb69d85953a32252f0ea73 (patch)
tree3b539b7456401046ebf4f121be567c614458fa91
parent6094b88c4868727c855efbc66c423e228bf8b3d6 (diff)
downloadgo-29eb7d18ed71c057bbdb69d85953a32252f0ea73.tar.gz
go-29eb7d18ed71c057bbdb69d85953a32252f0ea73.zip
crypto/x509: iOS build tag
The iOS simulator compiles with GOOS=darwin GOARCH=386, and x509 sets the inappropriate flag -mmacosx-version-min=10.6. Condition its compilation on the absence of an "ios" build tag. Fixes #11736. Change-Id: I4aa230643347320c3cb9d03b972734b2e0db930e Reviewed-on: https://go-review.googlesource.com/12301 TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r--src/crypto/x509/root_cgo_darwin.go2
-rw-r--r--src/crypto/x509/root_darwin_armx.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
index 9fb08ddf0b..bf4a5cdfee 100644
--- a/src/crypto/x509/root_cgo_darwin.go
+++ b/src/crypto/x509/root_cgo_darwin.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build cgo,!arm,!arm64
+// +build cgo,!arm,!arm64,!ios
package x509
diff --git a/src/crypto/x509/root_darwin_armx.go b/src/crypto/x509/root_darwin_armx.go
index 62b7d24c91..a3000cc7b5 100644
--- a/src/crypto/x509/root_darwin_armx.go
+++ b/src/crypto/x509/root_darwin_armx.go
@@ -5,7 +5,7 @@
// license that can be found in the LICENSE file.
// +build darwin
-// +build arm arm64
+// +build arm arm64 ios
package x509