From f9706f970f4da311d2e5e00548aa9bf38457ada9 Mon Sep 17 00:00:00 2001 From: Sebastien Binet Date: Mon, 25 Jun 2018 18:29:51 +0200 Subject: [PATCH] interp: use correct GOPATH from go/build.Default (#2) This CL uses go/build.Default.GOPATH to infer the correct value for $GOPATH at build time. Previously, pkgDir would fail if somebody were to build and test containous/gi from a different GOPATH location (e.g. GOPATH=/build/go) --- interp/src.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interp/src.go b/interp/src.go index 0c319c98..cc7c6d7e 100644 --- a/interp/src.go +++ b/interp/src.go @@ -1,6 +1,7 @@ package interp import ( + "go/build" "io/ioutil" "log" "os" @@ -53,7 +54,7 @@ func pkgDir(path string) string { if _, err := os.Stat(dir); err == nil { return dir } - dir = os.Getenv("HOME") + "/go/src/" + path + dir = filepath.Join(build.Default.GOPATH, "src", path) if _, err := os.Stat(dir); err != nil { log.Fatal(err) }