diff options
| author |   Zachary Ware <zachary.ware@gmail.com> | 2015-07-28 00:00:47 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-07-28 00:00:47 -0500 |
| commit | 62a23383dd5ce467a722ccdb4a306287c62005f9 (patch) | |
| tree | a7fc0132141d07b3016517ee3ba85111ce44ed3b /PCbuild | |
| parent | check return value of PyString_FromStringAndSize for NULL (closes #24734) (diff) | |
| download | cpython-62a23383dd5ce467a722ccdb4a306287c62005f9.tar.gz cpython-62a23383dd5ce467a722ccdb4a306287c62005f9.tar.bz2 cpython-62a23383dd5ce467a722ccdb4a306287c62005f9.zip | |
Set a default BasePlatformToolset to allow the ICC buildbot to build.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.props | 5 | ||||
| -rw-r--r-- | PCbuild/python.props | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index cab9830f4b2..fc9334760ea 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 f7965c33571..245e5716bdc 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. |