From: Russ Cox <rsc@golang.org>
Date: Mon, 12 Mar 2012 16:39:31 +0000 (-0400)
Subject: cmd/go: stop using $GOROOT and $GOBIN in script output
X-Git-Tag: weekly.2012-03-13~44
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=376fc748f6dfbe7ad12fc97d0bf8b2385c9314d7;p=gostls13.git

cmd/go: stop using $GOROOT and $GOBIN in script output

They were necessary to produce a canonical script
when we checked in build scripts, but now they're just
getting in the way.

Fixes #3279.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5796068
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 24c2a05d22..e62de32e16 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -929,8 +929,6 @@ func (b *builder) fmtcmd(dir string, format string, args ...interface{}) string
 	if b.work != "" {
 		cmd = strings.Replace(cmd, b.work, "$WORK", -1)
 	}
-	cmd = strings.Replace(cmd, gobin, "$GOBIN", -1)
-	cmd = strings.Replace(cmd, goroot, "$GOROOT", -1)
 	return cmd
 }