cmd/cgo: remove support for CGOPKGPATH

CGOPKGPATH variable was undocumented, but it is not needed anymore.

It was used before the existence of the go tool to tell cgo the full
path of the package that it was building, which in turn set the name
of the shared library that cgo expected to load back when cgo used
shared libraries. CGOPKGPATH no longer does anything useful;
it just affects the comments in the generated header file.

Remove it to avoid any future confusion.

Fixes #11852

Change-Id: Ieb452e5bbcfd05b87a4a3618b5b8f44423341858
Reviewed-on: https://go-review.googlesource.com/15266
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go
index 02d297ce8bd4ba6e33990ea8d5900839ca4008a1..5e7520db04e55e83d9f392a933e9fd18cdf6ec4d 100644 (file)
--- a/src/cmd/cgo/main.go
+++ b/src/cmd/cgo/main.go
@@ -279,11 +279,7 @@ func main() {
                if nerrors > 0 {
                        os.Exit(2)
                }
-               pkg := f.Package
-               if dir := os.Getenv("CGOPKGPATH"); dir != "" {
-                       pkg = filepath.Join(dir, pkg)
-               }
-               p.PackagePath = pkg
+               p.PackagePath = f.Package
                p.Record(f)
                if *godefs {
                        os.Stdout.WriteString(p.godefs(f, input))

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 0c2bc5f268ce055401b4ddb2f544e85306bef492..b894ed6c3aebdf32947518e3f306c107c81c1819 100644 (file)
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -2875,7 +2875,7 @@ func (b *builder) cgo(p *Package, cgoExe, obj string, pcCFLAGS, pcLDFLAGS, cgofi
        cgoCPPFLAGS = append(cgoCPPFLAGS, "-I", obj)
 
        // cgo
-       // TODO: CGOPKGPATH, CGO_FLAGS?
+       // TODO: CGO_FLAGS?
        gofiles := []string{obj + "_cgo_gotypes.go"}
        cfiles := []string{"_cgo_main.c", "_cgo_export.c"}
        for _, fn := range cgofiles {