Set a default BasePlatformToolset to allow the ICC buildbot to build. · python/cpython@62a2338 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75.3k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 62a2338

Browse filesBrowse the repository at this point in the historyBrowse files

zware

committed

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

1 parent 0287f2f commit 62a2338
Copy full SHA for 62a2338

2 files changed

+7-3Lines changed: 7 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• PCbuild
  • pyproject.props
  • python.props

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎PCbuild/pyproject.props‎

Copy file name to clipboardExpand all lines: PCbuild/pyproject.props

+3-2Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -11,8 +11,9 @@
11	11	<GenerateManifest Condition="'$(GenerateManifest)' == ''">false</GenerateManifest>
12	12	<EmbedManifest Condition="'$(EmbedManifest)' == ''">false</EmbedManifest>
13	13	<!-- For VS2008, we have to embed the manifest to be able to run -->
14		- <GenerateManifest Condition="'$(PlatformToolset)' == 'v90'">true</GenerateManifest>
15		- <EmbedManifest Condition="'$(PlatformToolset)' == 'v90'">true</EmbedManifest>
	14	+ <!-- BasePlatformToolset is for ICC support -->
	15	+ <GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
	16	+ <EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
16	17	<SupportPGO Condition="'$(SupportPGO)' == ''">true</SupportPGO>
17	18	<SupportSigning Condition="'$(SupportSigning)' == ''">true</SupportSigning>
18	19	<SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning>

Collapse file

‎PCbuild/python.props‎

Copy file name to clipboardExpand all lines: PCbuild/python.props

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -7,7 +7,10 @@
7	7	Use only MSVC 9.0, unless explicitly overridden
8	8	-->
9	9	<PlatformToolset Condition="'$(PlatformToolset)' == ''">v90</PlatformToolset>
10		-
	10	+ <!--
	11	+ Give a default for BasePlatformToolset as well, it's used by ICC and ignored otherwise
	12	+ -->
	13	+ <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(PlatformToolset)' != 'v90'">v90</BasePlatformToolset>
11	14	<!--
12	15	Convincing MSVC/MSBuild to prefer our platform names is too difficult,
13	16	so we define our own constant ArchName and use wherever we need it.

0 commit comments

Comments

0 (0)