From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 6 Jun 2023 19:49:20 +0000 (-0700)
Subject: [release-branch.go1.19] cmd/cgo: correct _cgo_flags output
X-Git-Tag: go1.19.11~15
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3ba9c890b86dc8c3a54c98d32497b7a8012704f9;p=gostls13.git

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

For #60306
For #60513

Change-Id: I8b37d74433456f3270c2ea465ecf406da6e5a578
Reviewed-on: https://go-review.googlesource.com/c/go/+/501297
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Bypass: Dmitri Shuralyov <dmitshur@golang.org>
---

diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index 97d92db9cd..6eb302b62b 100644
--- 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 {