From: Matthew Dempsky <mdempsky@google.com>
Date: Thu, 5 Nov 2015 02:12:30 +0000 (-0800)
Subject: cmd/dist: remove vestigial -s flag
X-Git-Tag: go1.6beta1~627
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7bb2a7d63b0767f9c6fa0382ed9185ba21757095;p=gostls13.git

cmd/dist: remove vestigial -s flag

Fixes #12002.

Change-Id: I7262f4520560ac158fc2ee3ce1d2f7a488d40354
Reviewed-on: https://go-review.googlesource.com/16666
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
---

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index bbf7968b55..bcf6e71d52 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -44,8 +44,7 @@ var (
 	rebuildall       bool
 	defaultclang     bool
 
-	sflag bool // build static binaries
-	vflag int  // verbosity
+	vflag int // verbosity
 )
 
 // The known architectures.
@@ -980,7 +979,6 @@ func cmdenv() {
 // stopping at having installed the go_bootstrap command.
 func cmdbootstrap() {
 	flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all")
-	flag.BoolVar(&sflag, "s", sflag, "build static binaries")
 	xflagparse(0)
 
 	if isdir(pathf("%s/src/pkg", goroot)) {
@@ -1128,7 +1126,6 @@ func defaulttarg() string {
 
 // Install installs the list of packages named on the command line.
 func cmdinstall() {
-	flag.BoolVar(&sflag, "s", sflag, "build static binaries")
 	xflagparse(-1)
 
 	if flag.NArg() == 0 {