Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit26c3e70

Browse files
[3.11]gh-110437: Allow overriding VCRuntimeDLL with a semicolon separated list of DLLs to bundle (GH-110470)
gh-110437: Allow overriding VCRuntimeDLL with a semicolon separated list of DLLs to bundle (GH-110470)(cherry picked from commit12cc679)Co-authored-by: Steve Dower <steve.dower@python.org>
1 parentb473d48 commit26c3e70

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Allows overriding the source of VC redistributables so that releases can be
2+
guaranteed to never downgrade between updates.

‎PCbuild/pyproject.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,10 @@ public override bool Execute() {
229229
</Target>
230230

231231
<TargetName="FindVCRuntime"Returns="VCRuntimeDLL"DependsOnTargets="FindVCRedistDir">
232-
<ItemGroupCondition="$(VCInstallDir) != ''">
232+
<ItemGroupCondition="$(VCRuntimeDLL) != ''">
233+
<VCRuntimeDLLInclude="$(VCRuntimeDLL)" />
234+
</ItemGroup>
235+
<ItemGroupCondition="$(VCInstallDir) != '' and $(VCRuntimeDLL) == ''">
233236
<VCRuntimeDLLInclude="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
234237
</ItemGroup>
235238

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp