From: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
Date: Tue, 18 Mar 2014 20:47:21 +0000 (+0100)
Subject: cmd/go: let build -x output describe CGO_LDFLAGS env variable
X-Git-Tag: go1.3beta1~330
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f081e2b9f41c8f4c1eec78180cbcaeab17f10f65;p=gostls13.git

cmd/go: let build -x output describe CGO_LDFLAGS env variable

Fixes #7249

LGTM=iant
R=golang-codereviews, iant
CC=golang-codereviews
https://golang.org/cl/75820046
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 182ffb2d2e..08d322daee 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -1357,7 +1357,13 @@ func (b *builder) processOutput(out []byte) string {
 func (b *builder) runOut(dir string, desc string, env []string, cmdargs ...interface{}) ([]byte, error) {
 	cmdline := stringList(cmdargs...)
 	if buildN || buildX {
-		b.showcmd(dir, "%s", joinUnambiguously(cmdline))
+		var envcmdline string
+		for i := range env {
+			envcmdline += env[i]
+			envcmdline += " "
+		}
+		envcmdline += joinUnambiguously(cmdline)
+		b.showcmd(dir, "%s", envcmdline)
 		if buildN {
 			return nil, nil
 		}