diff options
| author | Cherry Zhang <cherryyz@google.com> | 2020-10-06 20:36:52 -0400 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2020-10-07 20:07:07 +0000 |
| commit | 83dfc0d02d005f7de3b8a57ea29dacf8609edba8 (patch) | |
| tree | 8a27759554314a7825b0e8a676dc3daa78208af4 /src/time | |
| parent | 470829d474fb5ae1125c81bdfb10375373c881d5 (diff) | |
| download | go-83dfc0d02d005f7de3b8a57ea29dacf8609edba8.tar.gz go-83dfc0d02d005f7de3b8a57ea29dacf8609edba8.zip | |
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>
Diffstat (limited to 'src/time')
| -rw-r--r-- | src/time/zoneinfo_ios.go (renamed from src/time/zoneinfo_darwin_arm64.go) | 0 | ||||
| -rw-r--r-- | src/time/zoneinfo_unix.go | 2 | ||||
| -rw-r--r-- | src/time/zoneinfo_unix_test.go | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/time/zoneinfo_darwin_arm64.go b/src/time/zoneinfo_ios.go index 65feb84711..65feb84711 100644 --- a/src/time/zoneinfo_darwin_arm64.go +++ b/src/time/zoneinfo_ios.go diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go index 80724eb30a..d2465eef65 100644 --- 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 2d45b83d52..f290ae754f 100644 --- 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 |