From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 4 Dec 2018 16:25:39 +0000 (+0000)
Subject: cmd/go: revert multi-flag GOFLAGS doc example
X-Git-Tag: go1.12beta1~171
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8a5797a00e0bbe483e88aab4830e8854af55b508;p=gostls13.git

cmd/go: revert multi-flag GOFLAGS doc example

This partially reverts https://golang.org/cl/135035.

Reason for revert: multiple -ldflags=-foo flags simply override each
other, since that's the logic for per-package flags. The suggested
'GOFLAGS=-ldflags=-s -ldflags=-w' has never worked for 'go build', and
even breaks 'go test' and 'go vet'.

There should be a way to specify -ldflags='-w -s' via GOFLAGS, which is
being tracked in #29096. For now, just remove the incorrect suggestion.

Fixes #29053.

Change-Id: I9203056f7e5191e894bcd16595a92df2fb704ea7
Reviewed-on: https://go-review.googlesource.com/c/152479
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Alan Donovan <adonovan@google.com>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
---

diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index 12134b21c0..9108775e75 100644
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -1472,9 +1472,7 @@
 //
 // Each entry in the GOFLAGS list must be a standalone flag.
 // Because the entries are space-separated, flag values must
-// not contain spaces. In some cases, you can provide multiple flag
-// values instead: for example, to set '-ldflags=-s -w'
-// you can use 'GOFLAGS=-ldflags=-s -ldflags=-w'.
+// not contain spaces.
 //
 // Environment variables for use with cgo:
 //
diff --git a/src/cmd/go/internal/help/helpdoc.go b/src/cmd/go/internal/help/helpdoc.go
index c8ea66a327..ba9b14a4e6 100644
--- a/src/cmd/go/internal/help/helpdoc.go
+++ b/src/cmd/go/internal/help/helpdoc.go
@@ -509,9 +509,7 @@ General-purpose environment variables:
 
 Each entry in the GOFLAGS list must be a standalone flag.
 Because the entries are space-separated, flag values must
-not contain spaces. In some cases, you can provide multiple flag
-values instead: for example, to set '-ldflags=-s -w'
-you can use 'GOFLAGS=-ldflags=-s -ldflags=-w'.
+not contain spaces.
 
 Environment variables for use with cgo: