From 81368d9bb9cc503df33d470785edc816a9086cd3 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Wed, 6 Jun 2012 20:19:16 +0800 Subject: [PATCH] build: restore PATH before "dist banner" Fixes #3699. R=golang-dev, r, rsc CC=golang-dev https://golang.org/cl/6272048 --- src/all.bash | 2 ++ src/all.bat | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/all.bash b/src/all.bash index 454582c0c74..488ca4679e3 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 e3b61c0127b..8edfd7f43e4 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