time: enable system zoneinfo on macOS/ARM64

Updates #38485.

Change-Id: I4a8b509dc4ad03706235289fbe8c2a675453c871
Reviewed-on: https://go-review.googlesource.com/c/go/+/260339
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/time/zoneinfo_darwin_arm64.go b/src/time/zoneinfo_ios.go
similarity index 100%
rename from src/time/zoneinfo_darwin_arm64.go
rename to src/time/zoneinfo_ios.go

diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
index 80724eb30a72b2da80e09e832a37b806b86a062a..d2465eef65316a021c7af3f607a3c39b4e9827ac 100644 (file)
--- a/src/time/zoneinfo_unix.go
+++ b/src/time/zoneinfo_unix.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 aix darwin,amd64 dragonfly freebsd linux,!android netbsd openbsd solaris
+// +build aix darwin,!ios dragonfly freebsd linux,!android netbsd openbsd solaris
 
 // Parse "zoneinfo" time zone file.
 // This is a fairly standard file format used on OS X, Linux, BSD, Sun, and others.

diff --git a/src/time/zoneinfo_unix_test.go b/src/time/zoneinfo_unix_test.go
index 2d45b83d52ebdfb7b3199c289bae67a0d057c274..f290ae754f1856044bf4a7f129f346ed3a479b58 100644 (file)
--- a/src/time/zoneinfo_unix_test.go
+++ b/src/time/zoneinfo_unix_test.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 aix darwin,amd64 dragonfly freebsd linux,!android netbsd openbsd solaris
+// +build aix darwin,!ios dragonfly freebsd linux,!android netbsd openbsd solaris
 
 package time_test