From 1b9e36356be410adf3b0b80e99996f8f3476d8cf Mon Sep 17 00:00:00 2001
From: Andrew Gerrand <adg@golang.org>
Date: Thu, 4 Apr 2013 12:07:53 +1100
Subject: [PATCH] misc/dist: don't ship race-enabled commands

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/8350044
---
 misc/dist/bindist.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index 1f5cfc817e1..d06a4f6e289 100644
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -197,6 +197,12 @@ func (b *Build) Do() error {
 		if err != nil {
 			return err
 		}
+		// Re-install std without -race, so that we're not left with
+		// a slower, race-enabled cmd/go, cmd/godoc, etc.
+		_, err = b.run(src, goCmd, "install", "-a", "std")
+		if err != nil {
+			return err
+		}
 	}
 
 	if err := b.tour(); err != nil {