aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShenghou Ma <minux.ma@gmail.com>2012-06-13 16:24:44 -0400
committerShenghou Ma <minux.ma@gmail.com>2012-06-13 16:24:44 -0400
commitd261dc39aaf8bd2306d45f7de63d302279d1fecf (patch)
tree9009f6470a396665755fee2293365f9726531a01
parentd4a15ab8ca4568225fdca51f961c68960e426d82 (diff)
downloadgo-d261dc39aaf8bd2306d45f7de63d302279d1fecf.tar.gz
go-d261dc39aaf8bd2306d45f7de63d302279d1fecf.zip
[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 »»»
-rwxr-xr-xsrc/all.bash2
-rw-r--r--src/all.bat2
2 files changed, 4 insertions, 0 deletions
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