diff options
| author | Clément Chigot <clement.chigot@atos.net> | 2019-06-13 10:12:06 +0200 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-06-24 18:49:54 +0000 |
| commit | 4ae3835aa28d21fd9045223640b7617ca1b83dfe (patch) | |
| tree | f2c48666dd37f7434f3d10bfb3b178a7e85751c6 | |
| parent | 122a4fb7b038af1407a8b1c5ffe370bae70a5c69 (diff) | |
| download | go-4ae3835aa28d21fd9045223640b7617ca1b83dfe.tar.gz go-4ae3835aa28d21fd9045223640b7617ca1b83dfe.zip | |
cmd/go: silence ar with D flag failures
The first call of ar must not show its output in order to avoid useless
error messages about D flag.
Change-Id: I3a2f5144b3bb271705000b67cd46cd02e98aca77
Reviewed-on: https://go-review.googlesource.com/c/go/+/182077
Run-TryBot: Clément Chigot <clement.chigot@atos.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
| -rw-r--r-- | src/cmd/go/internal/work/gccgo.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/cmd/go/internal/work/gccgo.go b/src/cmd/go/internal/work/gccgo.go index 67065950b2..36726d369b 100644 --- a/src/cmd/go/internal/work/gccgo.go +++ b/src/cmd/go/internal/work/gccgo.go @@ -207,9 +207,16 @@ func (tools gccgoToolchain) pack(b *Builder, a *Action, afile string, ofiles []s } absAfile := mkAbs(objdir, afile) // Try with D modifier first, then without if that fails. - if b.run(a, p.Dir, p.ImportPath, nil, tools.ar(), arArgs, "rcD", absAfile, absOfiles) != nil { + output, err := b.runOut(a, p.Dir, nil, tools.ar(), arArgs, "rcD", absAfile, absOfiles) + if err != nil { return b.run(a, p.Dir, p.ImportPath, nil, tools.ar(), arArgs, "rc", absAfile, absOfiles) } + + if len(output) > 0 { + // Show the output if there is any even without errors. + b.showOutput(a, p.Dir, p.ImportPath, b.processOutput(output)) + } + return nil } |