From: David Symonds <dsymonds@golang.org>
Date: Tue, 14 Feb 2012 22:06:24 +0000 (+1100)
Subject: build: create the correct $GOTOOLDIR.
X-Git-Tag: weekly.2012-02-14~17
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0ab3ea9738bb28211c156faf38923bb6c28952cb;p=gostls13.git

build: create the correct $GOTOOLDIR.

Before this, make.bash --dist-tool would fail,
because $GOROOT/bin/tool was being mkdir'd
instead of $GOROOT/pkg/tool/linux_amd64.

R=rsc
CC=golang-dev
https://golang.org/cl/5666046
---

diff --git a/src/make.bash b/src/make.bash
index 5677b7012b..43183e786b 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -57,7 +57,6 @@ done
 
 echo '# Building C bootstrap tool.'
 echo cmd/dist
-mkdir -p ../bin/tool
 export GOROOT="$(cd .. && pwd)"
 GOROOT_FINAL="${GOROOT_FINAL:-$GOROOT}"
 DEFGOROOT='-DGOROOT_FINAL="'"$GOROOT_FINAL"'"'
@@ -67,6 +66,10 @@ echo
 
 if [ "$1" = "--dist-tool" ]; then
 	# Stop after building dist tool.
+	mkdir -p $GOTOOLDIR
+	if [ "$2" != "" ]; then
+		cp cmd/dist/dist "$2"
+	fi
 	mv cmd/dist/dist $GOTOOLDIR/dist
 	exit 0
 fi