qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 07:24:42 -07:00
Code Releases Activity

cmd/go: use correct link flags if main package contains C++/ObjC files

Browse Source 
LGTM=iant
R=iant
CC=golang-codereviews
https://golang.org/cl/117470043
This commit is contained in:
Peter Collingbourne 2014-08-01 16:45:33 -07:00 committed by Ian Lance Taylor
parent 668a55a882
commit fe513d8b3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/go/build.go
View File

@ -1708,7 +1708,7 @@ func packInternal(b *builder, afile string, ofiles []string) error {
func (gcToolchain) ld(b *builder, p *Package, out string, allactions []*action, mainpkg string, ofiles []string) error { func (gcToolchain) ld(b *builder, p *Package, out string, allactions []*action, mainpkg string, ofiles []string) error {
importArgs := b.includeArgs("-L", allactions) importArgs := b.includeArgs("-L", allactions)
cxx := false cxx := len(p.CXXFiles) > 0
for _, a := range allactions { for _, a := range allactions {
if a.p != nil && len(a.p.CXXFiles) > 0 { if a.p != nil && len(a.p.CXXFiles) > 0 {
cxx = true cxx = true
@ -1846,8 +1846,8 @@ func (tools gccgoToolchain) ld(b *builder, p *Package, out string, allactions []
ldflags := b.gccArchArgs() ldflags := b.gccArchArgs()
cgoldflags := []string{} cgoldflags := []string{}
usesCgo := false usesCgo := false
cxx := false cxx := len(p.CXXFiles) > 0
objc := false objc := len(p.MFiles) > 0
// Prefer the output of an install action to the output of a build action, // Prefer the output of an install action to the output of a build action,
// because the install action will delete the output of the build action. // because the install action will delete the output of the build action.