diff options
| author | Jeff Hodges <jeff@somethingsimilar.com> | 2012-02-06 11:26:15 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2012-02-06 11:26:15 -0500 |
| commit | eac86fd3f0edb3a82d51c3ced90a73fd17e22d81 (patch) | |
| tree | 2b2ef251bb2a3bc7b06dffe144de152997dcc46f | |
| parent | facee93a8627881ae39abda13cba115274fe20cf (diff) | |
| download | go-eac86fd3f0edb3a82d51c3ced90a73fd17e22d81.tar.gz go-eac86fd3f0edb3a82d51c3ced90a73fd17e22d81.zip | |
cmd/go: pass env CGO_CFLAGS to cgo
Passing the CGO_CFLAGS to cgo is required to make alternative include
directories work when building a cgo project.
R=rsc
CC=golang-dev
https://golang.org/cl/5635048
| -rw-r--r-- | src/cmd/go/build.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go index f6f8de5606..0956a35eae 100644 --- a/src/cmd/go/build.go +++ b/src/cmd/go/build.go @@ -1183,7 +1183,7 @@ func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string) (outGo, if _, ok := buildToolchain.(gccgoToolchain); ok { cgoflags = append(cgoflags, "-gccgo") } - if err := b.run(p.Dir, p.ImportPath, cgoExe, "-objdir", obj, cgoflags, "--", p.CgoFiles); err != nil { + if err := b.run(p.Dir, p.ImportPath, cgoExe, "-objdir", obj, cgoflags, "--", cgoCFLAGS, p.CgoFiles); err != nil { return nil, nil, err } outGo = append(outGo, gofiles...) |