diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-13 12:11:40 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-13 12:11:40 -0500 |
| commit | 774ac377daf0da8eaddc578d883cd2002cb7a6a4 (patch) | |
| tree | 1f7931b0ce49dd62621846ba61ccf3f4280386bb /PCbuild/env.bat | |
| parent | 9c680b07285867844927871ddcbf60c93e786e1f (diff) | |
| parent | 4c9c848159b63fac440c29ffc2b437e055d355cc (diff) | |
| download | cpython-git-774ac377daf0da8eaddc578d883cd2002cb7a6a4.tar.gz | |
Closes #17202: Merge with 3.4
Diffstat (limited to 'PCbuild/env.bat')
| -rw-r--r-- | PCbuild/env.bat | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/PCbuild/env.bat b/PCbuild/env.bat index 9d4c9d1c32..2b2c0051ce 100644 --- a/PCbuild/env.bat +++ b/PCbuild/env.bat @@ -1,16 +1,16 @@ -@echo off -rem This script adds the latest available tools to the path for the current -rem command window. However, most builds of Python will ignore the version -rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of -rem tools should be the same version to avoid potential conflicts. -rem -rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v100" (or -rem 'v110', 'v120' or 'v140') to the build script. - -echo Build environments: x86, amd64, x86_amd64 -echo. -set VSTOOLS=%VS140COMNTOOLS% -if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS% -if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS% -if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS% -call "%VSTOOLS%..\..\VC\vcvarsall.bat" %* +@echo off
+rem This script adds the latest available tools to the path for the current
+rem command window. However, most builds of Python will ignore the version
+rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of
+rem tools should be the same version to avoid potential conflicts.
+rem
+rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v100" (or
+rem 'v110', 'v120' or 'v140') to the build script.
+
+echo Build environments: x86, amd64, x86_amd64
+echo.
+set VSTOOLS=%VS140COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS%
+call "%VSTOOLS%..\..\VC\vcvarsall.bat" %*
|