From: Robert Griesemer Date: Tue, 16 Feb 2010 19:54:12 +0000 (-0800) Subject: godoc: fix initialization issue X-Git-Tag: weekly.2010-02-17~18 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ffd0961313423d51bddf2fa46a384fd3a13e3fe8;p=gostls13.git godoc: fix initialization issue R=rsc CC=golang-dev https://golang.org/cl/207111 --- diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go index 9cc194435e..176e33949f 100644 --- a/src/cmd/godoc/godoc.go +++ b/src/cmd/godoc/godoc.go @@ -100,7 +100,7 @@ var ( ) -func initRoots() { +func init() { goroot = os.Getenv("GOROOT") if goroot == "" { goroot = pathutil.Join(os.Getenv("HOME"), "go") diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go index ef08551ce7..4bff23f0df 100644 --- a/src/cmd/godoc/main.go +++ b/src/cmd/godoc/main.go @@ -152,7 +152,6 @@ func main() { log.Exitf("negative tabwidth %d", *tabwidth) } - initRoots() readTemplates() if *httpaddr != "" {