From 723686bb4b5d14fe323f5fd424b3c4bf73b560cc Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 28 Mar 2014 15:17:20 -0700 Subject: [PATCH] go.tools/cmd/godex: permit absolute paths for gccgo-generated package (export) files TBR=adonovan TBR=adonovan R=adonovan CC=golang-codereviews https://golang.org/cl/82030043 --- cmd/godex/gccgo.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/godex/gccgo.go b/cmd/godex/gccgo.go index bca2b6cc..5e5b2e15 100644 --- a/cmd/godex/gccgo.go +++ b/cmd/godex/gccgo.go @@ -21,13 +21,15 @@ import ( ) func init() { + incpaths := []string{"/"} + // importer for default gccgo var inst gccgoimporter.GccgoInstallation inst.InitFromDriver("gccgo") - register("gccgo", inst.GetImporter(nil)) + register("gccgo", inst.GetImporter(incpaths)) // importer for gccgo using condensed export format (experimental) - register("gccgo-new", getNewImporter(append(inst.SearchPaths(), "."))) + register("gccgo-new", getNewImporter(append(append(incpaths, inst.SearchPaths()...), "."))) } // This function is an adjusted variant of gccgoimporter.GccgoInstallation.GetImporter. @@ -72,6 +74,7 @@ func findExportFile(searchpaths []string, pkgpath string) (string, error) { pkgdir + "lib" + name + ".a", pkgfullpath + ".o", } { + println("trying", filepath) fi, err := os.Stat(filepath) if err == nil && !fi.IsDir() { return filepath, nil