From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 28 Jul 2015 05:00:47 +0000 (-0500)
Subject: Set a default BasePlatformToolset to allow the ICC buildbot to build.
X-Git-Tag: v2.7.11rc1~221
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a23383dd5ce467a722ccdb4a306287c62005f9;p=thirdparty%2FPython%2Fcpython.git

Set a default BasePlatformToolset to allow the ICC buildbot to build.
---

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index cab9830f4b22..fc9334760eac 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -11,8 +11,9 @@
     <GenerateManifest Condition="'$(GenerateManifest)' == ''">false</GenerateManifest>
     <EmbedManifest Condition="'$(EmbedManifest)' == ''">false</EmbedManifest>
     <!-- For VS2008, we have to embed the manifest to be able to run -->
-    <GenerateManifest Condition="'$(PlatformToolset)' == 'v90'">true</GenerateManifest>
-    <EmbedManifest Condition="'$(PlatformToolset)' == 'v90'">true</EmbedManifest>
+    <!-- BasePlatformToolset is for ICC support -->
+    <GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
     <SupportPGO Condition="'$(SupportPGO)' == ''">true</SupportPGO>
     <SupportSigning Condition="'$(SupportSigning)' == ''">true</SupportSigning>
     <SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning>
diff --git a/PCbuild/python.props b/PCbuild/python.props
index f7965c33571e..245e5716bdca 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -7,7 +7,10 @@
     Use only MSVC 9.0, unless explicitly overridden
     -->
     <PlatformToolset Condition="'$(PlatformToolset)' == ''">v90</PlatformToolset>
-
+    <!--
+    Give a default for BasePlatformToolset as well, it's used by ICC and ignored otherwise
+    -->
+    <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(PlatformToolset)' != 'v90'">v90</BasePlatformToolset>
     <!--
     Convincing MSVC/MSBuild to prefer our platform names is too difficult,
     so we define our own constant ArchName and use wherever we need it.