From: Elias Naur <mail@eliasnaur.com>
Date: Tue, 30 Apr 2019 18:36:20 +0000 (+0200)
Subject: time: look for zoneinfo.zip in GOROOT
X-Git-Tag: go1.13beta1~476
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8e4f1a71f22683745c863a776878d9c47e737305;p=gostls13.git

time: look for zoneinfo.zip in GOROOT

The zoneinfo.zip file will be in the $GOROOT in self-hsoted builds
on iOS.

Updates #31722

Change-Id: I991fae92e3dc50581b099a2d8901aed36ecc7cef
Reviewed-on: https://go-review.googlesource.com/c/go/+/174310
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/time/zoneinfo_ios.go b/src/time/zoneinfo_ios.go
index 6d7f975a11..09383a5b30 100644
--- a/src/time/zoneinfo_ios.go
+++ b/src/time/zoneinfo_ios.go
@@ -7,10 +7,14 @@
 
 package time
 
-import "syscall"
+import (
+	"runtime"
+	"syscall"
+)
 
 var zoneSources = []string{
 	getZipParent() + "/zoneinfo.zip",
+	runtime.GOROOT() + "/lib/time/zoneinfo.zip",
 }
 
 func getZipParent() string {