qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-03 03:01:21 -06:00
Code Releases Activity

cmd/go: print SWIG warnings

Browse Source 
Fixes #9053

Change-Id: I7b9af3647800671f065c366a6adf9278e64ebec9
Reviewed-on: https://go-review.googlesource.com/8400
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Michael Schaller 2015-04-02 13:15:08 +02:00 committed by Ian Lance Taylor
parent 822a24b602
commit d6dff636ea
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2645,16 +2645,20 @@ func (b *builder) swigOne(p *Package, file, obj string, pcCFLAGS []string, cxx b
args = append(args, "-c++") args = append(args, "-c++")
} }
if out, err := b.runOut(p.Dir, p.ImportPath, nil, "swig", args, file); err != nil { out, err := b.runOut(p.Dir, p.ImportPath, nil, "swig", args, file)
if err != nil {
if len(out) > 0 { if len(out) > 0 {
if bytes.Contains(out, []byte("-intgosize")) || bytes.Contains(out, []byte("-cgo")) { if bytes.Contains(out, []byte("-intgosize")) || bytes.Contains(out, []byte("-cgo")) {
return "", "", errors.New("must have SWIG version >= 3.0.6") return "", "", errors.New("must have SWIG version >= 3.0.6")
} }
b.showOutput(p.Dir, p.ImportPath, b.processOutput(out)) b.showOutput(p.Dir, p.ImportPath, b.processOutput(out)) // swig error
return "", "", errPrintedOutput return "", "", errPrintedOutput
} }
return "", "", err return "", "", err
} }
if len(out) > 0 {
b.showOutput(p.Dir, p.ImportPath, b.processOutput(out)) // swig warning
}
return obj + goFile, obj + gccBase + gccExt, nil return obj + goFile, obj + gccBase + gccExt, nil
} }