cmd/cgo: ensure the command passed to run retains a trailing dash

ianlancetaylor · ianlancetaylor · commit d9e2ba4fcce0 · 2018-12-19T15:47:36.000Z
This was accidentally broken by CL 127755. Fixes golang#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>
diff --git a/misc/cgo/test/issue4339.go b/misc/cgo/test/issue4339.go
@@ -5,7 +5,8 @@
 package cgotest
 
 /*
-#include "issue4339.h"
+// We've historically permitted #include <>, so test it here.  Issue 29333.
+#include <issue4339.h>
 */
 import "C"
 
diff --git 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, " "))

Original file line number	Diff line number	Diff line change
`@@ -1992,8 +1992,10 @@ func (p *Package) gccErrors(stdin []byte) string {`
`1992`	`1992`	`}`
`1993`	`1993`	`}`
`1994`	`1994`
`1995`		`- // Force -O0 optimization`
	`1995`	`+ // Force -O0 optimization but keep the trailing "-" at the end.`
`1996`	`1996`	`nargs = append(nargs, "-O0")`
	`1997`	`+ nl := len(nargs)`
	`1998`	`+ nargs[nl-2], nargs[nl-1] = nargs[nl-1], nargs[nl-2]`
`1997`	`1999`
`1998`	`2000`	`if *debugGcc {`
`1999`	`2001`	`fmt.Fprintf(os.Stderr, "$ %s <<EOF\n", strings.Join(nargs, " "))`