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 182ffb2d2eb10afa998b8677277634966df02a9d..08d322daee45ecb240f36c3123f9466b11aa81fc 100644 (file)
--- 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
                }