From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 29 Jan 2011 00:07:56 +0000 (+0000)
Subject: time: Look for zoneinfo files in Solaris directory.
X-Git-Tag: releases/gcc-4.6.0~888
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43e47101473e16f7acf72b771a4b7f139fce3536;p=thirdparty%2Fgcc.git

time: Look for zoneinfo files in Solaris directory.

From-SVN: r169380
---

diff --git a/libgo/go/time/zoneinfo_unix.go b/libgo/go/time/zoneinfo_unix.go
index 26c86ab038dd..6685da7477b0 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
 	}