diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2014-11-22 12:54:57 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2014-11-22 12:54:57 -0800 |
| commit | abd788eff0d3cda18a5b03bc92e556b2786150a3 (patch) | |
| tree | 7c7fc06b51d540bd5677ac63192b481b4714917e /PCbuild/env.bat | |
| parent | f4caa9bda1758324a4e797986308dfa9e9767613 (diff) | |
| download | cpython-abd788eff0d3cda18a5b03bc92e556b2786150a3.tar.gz | |
Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.
Diffstat (limited to 'PCbuild/env.bat')
| -rw-r--r-- | PCbuild/env.bat | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/PCbuild/env.bat b/PCbuild/env.bat index f0268a9135..9d4c9d1c32 100644 --- a/PCbuild/env.bat +++ b/PCbuild/env.bat @@ -1,5 +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, ia64, amd64, x86_amd64, x86_ia64 +echo Build environments: x86, amd64, x86_amd64 echo. -call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %1 +set VSTOOLS=%VS140COMNTOOLS% +if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS% +if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS% +if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS% +call "%VSTOOLS%..\..\VC\vcvarsall.bat" %* |