aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2018-12-19 07:03:04 -0800
committerIan Lance Taylor <iant@golang.org>2018-12-19 15:47:36 +0000
commitd9e2ba4fcce0a405e2d103e43c19f01fa1a5401d (patch)
tree0fdd384daa96c5c796a19899e7880da843086678 /src
parentd902f23ec416fc881d567c1a81a3d2c48cc16855 (diff)
downloadgo-d9e2ba4fcce0a405e2d103e43c19f01fa1a5401d.tar.xz
cmd/cgo: ensure the command passed to run retains a trailing dash
This was accidentally broken by CL 127755. Fixes #29333 Change-Id: I5e92048c64a55c1699d6c38eb4dbbd51c817b820 Reviewed-on: https://go-review.googlesource.com/c/155037 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/cgo/gcc.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 27bd59b54e..11c3ff3a9c 100644
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -1992,8 +1992,10 @@ func (p *Package) gccErrors(stdin []byte) string {
}
}
- // Force -O0 optimization
+ // Force -O0 optimization but keep the trailing "-" at the end.
nargs = append(nargs, "-O0")
+ nl := len(nargs)
+ nargs[nl-2], nargs[nl-1] = nargs[nl-1], nargs[nl-2]
if *debugGcc {
fmt.Fprintf(os.Stderr, "$ %s <<EOF\n", strings.Join(nargs, " "))