From: Shenghou Ma <minux.ma@gmail.com>
Date: Wed, 6 Jun 2012 12:19:16 +0000 (+0800)
Subject: build: restore PATH before "dist banner"
X-Git-Tag: go1.1rc2~2984
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=81368d9bb9cc503df33d470785edc816a9086cd3;p=gostls13.git

build: restore PATH before "dist banner"
        Fixes #3699.

R=golang-dev, r, rsc
CC=golang-dev
https://golang.org/cl/6272048
---

diff --git a/src/all.bash b/src/all.bash
index 454582c0c7..488ca4679e 100755
--- a/src/all.bash
+++ b/src/all.bash
@@ -8,6 +8,8 @@ if [ ! -f make.bash ]; then
 	echo 'all.bash must be run from $GOROOT/src' 1>&2
 	exit 1
 fi
+OLDPATH="$PATH"
 . ./make.bash --no-banner
 bash run.bash --no-rebuild
+PATH="$OLDPATH"
 $GOTOOLDIR/dist banner  # print build info
diff --git a/src/all.bat b/src/all.bat
index e3b61c0127..8edfd7f43e 100644
--- a/src/all.bat
+++ b/src/all.bat
@@ -11,10 +11,12 @@ echo all.bat must be run from go\src
 goto end
 :ok
 
+set OLDPATH=%PATH%
 call make.bat --no-banner --no-local
 if %GOBUILDFAIL%==1 goto end
 call run.bat --no-rebuild --no-local
 if %GOBUILDFAIL%==1 goto end
+set PATH=%OLDPATH%
 go tool dist banner
 
 :end