diff options
| author | Jeremy Faller <jeremy@golang.org> | 2020-09-30 17:57:14 -0400 |
|---|---|---|
| committer | Jeremy Faller <jeremy@golang.org> | 2020-09-30 18:00:58 -0400 |
| commit | 91e4d2d57bc341dd82c98247117114c851380aef (patch) | |
| tree | 15a2d023cdc63543cf8a6e99f8a561c0a0459000 /src/crypto/x509/root_darwin_ios_gen.go | |
| parent | c863e14a6c15e174ac0979ddd7f9530d6a4ec9cc (diff) | |
| parent | 846dce9d05f19a1f53465e62a304dea21b99f910 (diff) | |
| download | go-91e4d2d57bc341dd82c98247117114c851380aef.tar.gz go-91e4d2d57bc341dd82c98247117114c851380aef.zip | |
[dev.link] Merge branch 'master' into dev.link
2 conflicts, that make sense.
src/cmd/internal/obj/objfile.go
src/cmd/link/internal/loader/loader.go
Change-Id: Ib224e2d248cb568fa1e888af79dd908b2f5e05ff
Diffstat (limited to 'src/crypto/x509/root_darwin_ios_gen.go')
| -rw-r--r-- | src/crypto/x509/root_darwin_ios_gen.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/crypto/x509/root_darwin_ios_gen.go b/src/crypto/x509/root_darwin_ios_gen.go index 7a42466e5f..61152b4d11 100644 --- a/src/crypto/x509/root_darwin_ios_gen.go +++ b/src/crypto/x509/root_darwin_ios_gen.go @@ -4,7 +4,7 @@ // +build ignore -// Generates root_darwin_ios.go. +// Generates root_darwin_iosx.go. // // As of iOS 13, there is no API for querying the system trusted X.509 root // certificates. @@ -37,7 +37,10 @@ import ( ) func main() { - var output = flag.String("output", "root_darwin_ios.go", "file name to write") + // Temporarily name the file _iosx.go, to avoid restricting it to GOOS=ios, + // as this is also used for darwin/arm64 (macOS). + // TODO: maybe use darwin/amd64 implementation on macOS arm64? + var output = flag.String("output", "root_darwin_iosx.go", "file name to write") var version = flag.String("version", "", "security_certificates version") flag.Parse() if *version == "" { |