From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Wed, 1 Feb 2012 18:07:32 +0000 (-0200)
Subject: cmd/go: fix including of _cgo_export.h
X-Git-Tag: weekly.2012-02-07~146
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9fb24b944812fe555b09395ff341c9818d98e25b;p=gostls13.git

cmd/go: fix including of _cgo_export.h

This will add the temporary object directory into the lookup
path so that cgo-exported function declarations may be
included from C files.

This was previously applied by CL 5600043, and apparently
removed by mistake on CL 5598045.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5610054
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 5f3cbb4574..bad37df21c 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -1148,6 +1148,9 @@ func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string) (outGo,
 		}
 	}
 
+	// Allows including _cgo_export.h from .[ch] files in the package.
+	cgoCFLAGS = append(cgoCFLAGS, "-I", obj)
+
 	// cgo
 	// TODO: CGOPKGPATH, CGO_FLAGS?
 	gofiles := []string{obj + "_cgo_gotypes.go"}