code review 5642045: cmd/dist: fix GOROOT_FINAL

src/make.bash

 #!/usr/bin/env bash
 # Copyright 2009 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
 set -e
 if [ ! -f run.bash ]; then
         echo 'make.bash must be run from $GOROOT/src' 1>&2
         exit 1
 fi
@@ skipping 29 matching lines @@
 
                         sleep 5
                 fi
         fi
 done
 
 # Finally!  Run the build.
 
 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
 
 if [ "$1" = "--dist-tool" ]; then
         # Stop after building dist tool.
         exit 0
 fi
 
 echo '# Building compilers and Go bootstrap tool.'
 ../bin/tool/dist bootstrap -v # builds go_bootstrap
 echo
 
 echo '# Building packages and commands.'
 ../bin/tool/go_bootstrap clean std
 ../bin/tool/go_bootstrap install -a -v std
 rm -f ../bin/tool/go_bootstrap
 echo
 
 if [ "$1" != "--no-banner" ]; then
         ../bin/tool/dist banner
 fi