Commit 0ab3ea97 authored by David Symonds's avatar David Symonds

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
parent 3a582a76
...@@ -57,7 +57,6 @@ done ...@@ -57,7 +57,6 @@ done
echo '# Building C bootstrap tool.' echo '# Building C bootstrap tool.'
echo cmd/dist echo cmd/dist
mkdir -p ../bin/tool
export GOROOT="$(cd .. && pwd)" export GOROOT="$(cd .. && pwd)"
GOROOT_FINAL="${GOROOT_FINAL:-$GOROOT}" GOROOT_FINAL="${GOROOT_FINAL:-$GOROOT}"
DEFGOROOT='-DGOROOT_FINAL="'"$GOROOT_FINAL"'"' DEFGOROOT='-DGOROOT_FINAL="'"$GOROOT_FINAL"'"'
...@@ -67,6 +66,10 @@ echo ...@@ -67,6 +66,10 @@ echo
if [ "$1" = "--dist-tool" ]; then if [ "$1" = "--dist-tool" ]; then
# Stop after building dist tool. # Stop after building dist tool.
mkdir -p $GOTOOLDIR
if [ "$2" != "" ]; then
cp cmd/dist/dist "$2"
fi
mv cmd/dist/dist $GOTOOLDIR/dist mv cmd/dist/dist $GOTOOLDIR/dist
exit 0 exit 0
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment