aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Brainman <alex.brainman@gmail.com>2012-02-16 10:44:55 +1100
committerAlex Brainman <alex.brainman@gmail.com>2012-02-16 10:44:55 +1100
commit034c72a5573a8d6f97f7ab241de271a09c356817 (patch)
tree0fbae6a5d8ad55dbf0b1a88f9d986bd0d9dfdc63 /src
parent32cb495b185b50b08aea7fd9402ddf3152f1fda8 (diff)
downloadgo-034c72a5573a8d6f97f7ab241de271a09c356817.tar.xz
build: use setlocal in run.bat
R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5672061
Diffstat (limited to 'src')
-rw-r--r--src/all.bat2
-rw-r--r--src/run.bat7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/all.bat b/src/all.bat
index 980f937efc..e3b61c0127 100644
--- a/src/all.bat
+++ b/src/all.bat
@@ -13,7 +13,7 @@ goto end
call make.bat --no-banner --no-local
if %GOBUILDFAIL%==1 goto end
-call run.bat --no-rebuild
+call run.bat --no-rebuild --no-local
if %GOBUILDFAIL%==1 goto end
go tool dist banner
diff --git a/src/run.bat b/src/run.bat
index 3fb1183414..f258ae10f8 100644
--- a/src/run.bat
+++ b/src/run.bat
@@ -3,6 +3,13 @@
:: license that can be found in the LICENSE file.
@echo off
+:: Keep environment variables within this script
+:: unless invoked with --no-local.
+if x%1==x--no-local goto nolocal
+if x%2==x--no-local goto nolocal
+setlocal
+:nolocal
+
set GOBUILDFAIL=0
rem TODO avoid rebuild if possible