summaryrefslogtreecommitdiffstats
path: root/PCbuild/python.props
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-07-28 05:00:47 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-07-28 05:00:47 (GMT)
commit62a23383dd5ce467a722ccdb4a306287c62005f9 (patch)
treea7fc0132141d07b3016517ee3ba85111ce44ed3b /PCbuild/python.props
parent0287f2f7cbeee90491b24f24da871c981074ac00 (diff)
downloadcpython-62a23383dd5ce467a722ccdb4a306287c62005f9.zip
cpython-62a23383dd5ce467a722ccdb4a306287c62005f9.tar.gz
cpython-62a23383dd5ce467a722ccdb4a306287c62005f9.tar.bz2
Set a default BasePlatformToolset to allow the ICC buildbot to build.
Diffstat (limited to 'PCbuild/python.props')
-rw-r--r--PCbuild/python.props5
1 files changed, 4 insertions, 1 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props
index f7965c3..245e571 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.