diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-29 00:07:56 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-29 00:07:56 +0000 |
| commit | 65e2bed7ee0ebfefa50279673c5c5d1cff80daff (patch) | |
| tree | ba167c225c11f5810f7a3408df6034a307111d90 /libgo/go/time | |
| parent | dfc6e19d23f2e2617c13965310a61d3719c64c44 (diff) | |
| download | gcc-65e2bed7ee0ebfefa50279673c5c5d1cff80daff.tar.gz | |
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
Diffstat (limited to 'libgo/go/time')
| -rw-r--r-- | libgo/go/time/zoneinfo_unix.go | 7 |
1 files changed, 6 insertions, 1 deletions
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 } |