Force absolute paths in builders (#1664)

bazel-contrib · Aug 16, 2018 · 0b98d55 · 0b98d55
1 parent 1e88fb4
commit 0b98d55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/go/tools/builders/compile.go b/go/tools/builders/compile.go
@@ -186,6 +186,7 @@ func buildImportcfgFile(archives []archive, stdImports []string, installSuffix,
 	if !ok {
 		return "", errors.New("GOROOT not set")
 	}
+	goroot = abs(goroot)
 	for _, imp := range stdImports {
 		path := filepath.Join(goroot, "pkg", installSuffix, filepath.FromSlash(imp))
 		fmt.Fprintf(buf, "packagefile %s=%s.a\n", imp, path)

diff --git a/go/tools/builders/link.go b/go/tools/builders/link.go
@@ -143,7 +143,7 @@ func buildImportcfgFile(archives []archive, packageList, installSuffix, dir stri
 	if !ok {
 		return "", errors.New("GOROOT not set")
 	}
-	prefix := filepath.Join(goroot, "pkg", installSuffix)
+	prefix := abs(filepath.Join(goroot, "pkg", installSuffix))
 	packageListFile, err := os.Open(packageList)
 	if err != nil {
 		return "", err