aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2010-02-16 11:54:12 -0800
committerRobert Griesemer <gri@golang.org>2010-02-16 11:54:12 -0800
commitffd0961313423d51bddf2fa46a384fd3a13e3fe8 (patch)
treebd1980e8cafc60f837445720ff014e235b79dc64
parent5aa3a8de6d16404e26438fec7a386a93bedd0297 (diff)
downloadgo-ffd0961313423d51bddf2fa46a384fd3a13e3fe8.tar.gz
go-ffd0961313423d51bddf2fa46a384fd3a13e3fe8.zip
godoc: fix initialization issue
R=rsc CC=golang-dev https://golang.org/cl/207111
-rw-r--r--src/cmd/godoc/godoc.go2
-rw-r--r--src/cmd/godoc/main.go1
2 files changed, 1 insertions, 2 deletions
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 != "" {