summaryrefslogtreecommitdiff
path: root/src/make.bash
diff options
context:
space:
mode:
authorGustavo Niemeyer <gustavo@niemeyer.net>2012-02-09 20:47:12 -0200
committerGustavo Niemeyer <gustavo@niemeyer.net>2012-02-09 20:47:12 -0200
commit1bbb93d3d3953d11ac49a2687218a26b741c02f2 (patch)
tree7499fe13a6e750dc5171e4f96f22cfb337d3c0cf /src/make.bash
parent522f785c5cc1e7f6aa96c61856dcd8726b5d9071 (diff)
downloadgo-1bbb93d3d3953d11ac49a2687218a26b741c02f2.tar.gz
cmd/dist: fix GOROOT_FINAL
R=rsc, gustavo CC=golang-dev http://codereview.appspot.com/5642045
Diffstat (limited to 'src/make.bash')
-rwxr-xr-xsrc/make.bash4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/make.bash b/src/make.bash
index 32a91a2fc..55a292eba 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -47,7 +47,9 @@ done
echo '# Building C bootstrap tool.'
mkdir -p ../bin/tool
-DEFGOROOT='-DDEFAULT_GOROOT="'"$(cd .. && pwd)"'"'
+export GOROOT="$(cd .. && pwd)"
+GOROOT_FINAL="${GOROOT_FINAL:-$GOROOT}"
+DEFGOROOT='-DGOROOT_FINAL="'"$GOROOT_FINAL"'"'
gcc -O2 -Wall -Werror -o ../bin/tool/dist -Icmd/dist "$DEFGOROOT" cmd/dist/*.c
echo