[release-branch.go1] build: restore PATH before "dist banner"

««« backport 2787cca7ac8f
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 454582c0c7459bd0aecad0abe112f1b4e0752795..488ca4679e3c58bb1d4c611e7706a5aebf7f579d 100755 (executable)
--- 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 e3b61c0127b5de87f59e902a9ad7899c1fc1e975..8edfd7f43e464ca0eda06234829bef795da8c9b6 100644 (file)
--- 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