cgo: allow .so in subdirectories

R=r
https://golang.org/cl/157103

diff --git a/src/Make.pkg b/src/Make.pkg
index d763951d1dbe7146ed5defe93d6633508fdeb02c..29d028d541594b18732d7476aeefb5c25ec733da 100644 (file)
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -88,7 +88,7 @@ dir:
 #      x.cgo4.c - C implementations compiled with gcc to create dynamic library
 #
 %.cgo1.go %.cgo2.go %.cgo3.c %.cgo4.c: %.go
-       cgo $(CGO_CFLAGS) $*.go
+       CGOPKGPATH=$(dir) cgo $(CGO_CFLAGS) $*.go
 
 # The rules above added x.cgo1.go and x.cgo2.go to $(GOFILES),
 # added x.cgo3.$O to $OFILES, and added the installed copy of

diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go
index fa88e9de580cfd19457121cf313f8ff27b286ebb..8202b8e2bccf43e9889c49ce2299cd214c1cae47 100644 (file)
--- a/src/cmd/cgo/main.go
+++ b/src/cmd/cgo/main.go
@@ -101,6 +101,6 @@ func main() {
                os.Exit(2)
        }
 
-       p.PackagePath = p.Package;
+       p.PackagePath = os.Getenv("CGOPKGPATH") + "/" + p.Package;
        p.writeOutput(input);
 }