From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 8 Sep 2017 18:21:06 +0000 (-0700)
Subject: [2.7] bpo-30450: Fall back on the old env.bat (GH-3443)
X-Git-Tag: v2.7.15rc1~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1911cf3dd2ae67d600c166ba52872fdcf3e85824;p=thirdparty%2FPython%2Fcpython.git

[2.7] bpo-30450: Fall back on the old env.bat (GH-3443)
---

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 13da4be44044..b263ec7a654c 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -101,7 +101,7 @@ if exist "%GIT%" set GITProperty=/p:GIT="%GIT%"
 
 rem Setup the environment
 call "%dir%find_msbuild.bat" %MSBUILD%
-if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2)
+if ERRORLEVEL 1 (call "%dir%env.bat" && set MSBUILD=msbuild)
 
 if "%kill%"=="true" call :Kill