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 5677b7012bfe8b59db0d0715f7527ea71c4dc54b..43183e786bfe62162945e0219194dc0604b624d2 100755 (executable)
--- 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