diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-01-30 01:09:41 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-01-30 01:09:41 (GMT) |
| commit | 03178a5f7eb7af39b07ef43834c815ade6a394e6 (patch) | |
| tree | d412d3b952c160e2a49573b175639557c955891d /PCbuild | |
| parent | 7602b76d47fd66ae88a73d0d4fedb8612547876a (diff) | |
| parent | 4c5ad9452b171acb15e8b8a2277cceb1c363db47 (diff) | |
| download | cpython-03178a5f7eb7af39b07ef43834c815ade6a394e6.zip cpython-03178a5f7eb7af39b07ef43834c815ade6a394e6.tar.gz cpython-03178a5f7eb7af39b07ef43834c815ade6a394e6.tar.bz2 | |
Issue #25934: Merge with 3.5
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.props | 3 | ||||
| -rw-r--r-- | PCbuild/python.props | 16 |
2 files changed, 14 insertions, 5 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 25cdfcc..f32b1bf 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -50,6 +50,9 @@ <WholeProgramOptimization>false</WholeProgramOptimization> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> + <ClCompile Condition="$(ICCBuild) == 'true'"> + <FloatingPointModel>Strict</FloatingPointModel> + </ClCompile> <Link> <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/PCbuild/python.props b/PCbuild/python.props index 862f041..4d8f603 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -7,12 +7,18 @@ Use the latest available version of Visual Studio to build. To override this and build with an earlier version, pass "/p:PlatformToolset=v100" (for example) when building. + + We set BasePlatformToolset for ICC's benefit, it's otherwise ignored. --> - <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</PlatformToolset> - <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</PlatformToolset> - <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110</PlatformToolset> - <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath10)' != ''">v100</PlatformToolset> - + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</BasePlatformToolset> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</BasePlatformToolset> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110</BasePlatformToolset> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath10)' != ''">v100</BasePlatformToolset> + + <PlatformToolset Condition="'$(PlatformToolset)' == ''">$(BasePlatformToolset)</PlatformToolset> + <ICCBuild>false</ICCBuild> + <ICCBuild Condition="$(PlatformToolset.StartsWith(`Intel C++ Compiler`))">true</ICCBuild> + <!-- Convincing MSVC/MSBuild to prefer our platform names is too difficult, so we define our own constant ArchName and use wherever we need it. |