[release-branch.go1.20] cmd/cgo: correct _cgo_flags output

For #60306
For #60514

Change-Id: I3f5d14aee7d7195030e8872e42b1d97aa11d3582
Reviewed-on: https://go-review.googlesource.com/c/go/+/501298
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index d0c6fe3d4c2c22880461b8acd3aee05798617aec..a48f52105628a3ef7641bd54f03ab71779448627 100644 (file)
--- a/src/cmd/cgo/out.go
+++ b/src/cmd/cgo/out.go
@@ -48,7 +48,7 @@ func (p *Package) writeDefs() {
        fflg := creat(*objDir + "_cgo_flags")
        for k, v := range p.CgoFlags {
                for _, arg := range v {
-                       fmt.Fprintf(fflg, "_CGO_%s=%s\n", arg)
+                       fmt.Fprintf(fflg, "_CGO_%s=%s\n", k, arg)
                }
                if k == "LDFLAGS" && !*gccgo {
                        for _, arg := range v {