From: Alex Brainman <alex.brainman@gmail.com>
Date: Wed, 15 Feb 2012 23:44:55 +0000 (+1100)
Subject: build: use setlocal in run.bat
X-Git-Tag: weekly.2012-02-22~212
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=034c72a5573a8d6f97f7ab241de271a09c356817;p=gostls13.git

build: use setlocal in run.bat

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

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