From 65e2bed7ee0ebfefa50279673c5c5d1cff80daff Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 29 Jan 2011 00:07:56 +0000 Subject: time: Look for zoneinfo files in Solaris directory. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169380 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgo/go/time/zoneinfo_unix.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libgo/go/time') diff --git a/libgo/go/time/zoneinfo_unix.go b/libgo/go/time/zoneinfo_unix.go index 26c86ab038d..6685da7477b 100644 --- a/libgo/go/time/zoneinfo_unix.go +++ b/libgo/go/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 } -- cgit v1.2.1