From 260db6ea5a3dbf12a95fd438704e01cae42e3f56 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Mon, 30 Jan 2012 12:08:35 -0800
Subject: [PATCH] build: fix buildscript breakage after all.bash

Fix from Russ. Tested that multiple builds in a row
work again.

R=rsc, rsc
CC=golang-dev
https://golang.org/cl/5599047
---
 src/buildscript.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/buildscript.sh b/src/buildscript.sh
index 1afdb69593d..905077c99a9 100755
--- a/src/buildscript.sh
+++ b/src/buildscript.sh
@@ -35,6 +35,8 @@ set -e
 		s/\$WORK/"$WORK"/g
 		s;"\$GOBIN"/go;&_bootstrap;g
 		s;\\;/;g
+		s/go_bootstrap-tool/go-tool/g
+		s;"\$GOBIN"/go-tool;"$GOROOT"/bin/go-tool;g
 	'
 	)>$targ
 	chmod +x $targ