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 9cc194435e5a0298ac11820c957034f11d870ff4..176e33949fa20abc38b230dff6614dd82401e898 100644 (file)
--- 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 ef08551ce7ee4d13ad595e498f590524a2b45d00..4bff23f0dfd60d7fca06321201435dd249832ebb 100644 (file)
--- 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 != "" {