aboutsummaryrefslogtreecommitdiff
path: root/src/make.bash
diff options
context:
space:
mode:
authorDavid Symonds <dsymonds@golang.org>2012-02-15 09:06:24 +1100
committerDavid Symonds <dsymonds@golang.org>2012-02-15 09:06:24 +1100
commit0ab3ea9738bb28211c156faf38923bb6c28952cb (patch)
tree49b58dab204507d9b9c6c3ef0e3acd349f9aa053 /src/make.bash
parent3a582a768be7c95cbaf1a450140f367d9b7221d0 (diff)
downloadgo-0ab3ea9738bb28211c156faf38923bb6c28952cb.tar.xz
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
Diffstat (limited to 'src/make.bash')
-rwxr-xr-xsrc/make.bash5
1 files changed, 4 insertions, 1 deletions
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