time: Support Solaris zoneinfo directory.

R=rsc
CC=golang-dev
https://golang.org/cl/4079047

diff --git a/src/pkg/time/zoneinfo_unix.go b/src/pkg/time/zoneinfo_unix.go
index 26c86ab038dda52ac8ae904a77cccc27faf2c1eb..6685da7477b05f0d99754b5780e3083c3960cd68 100644 (file)
--- a/src/pkg/time/zoneinfo_unix.go
+++ b/src/pkg/time/zoneinfo_unix.go
@@ -18,6 +18,7 @@ import (
 const (
        headerSize = 4 + 16 + 4*7
        zoneDir    = "/usr/share/zoneinfo/"
+       zoneDir2   = "/usr/share/lib/zoneinfo/"
 )
 
 // Simple I/O interface to binary blob of data.
@@ -216,7 +217,11 @@ func setupZone() {
        case err == os.ENOENV:
                zones, _ = readinfofile("/etc/localtime")
        case len(tz) > 0:
-               zones, _ = readinfofile(zoneDir + tz)
+               var ok bool
+               zones, ok = readinfofile(zoneDir + tz)
+               if !ok {
+                       zones, _ = readinfofile(zoneDir2 + tz)
+               }
        case len(tz) == 0:
                // do nothing: use UTC
        }