8000 [3.11] gh-110437: Allow overriding VCRuntimeDLL with a semicolon sepa… · python/cpython@26c3e70 · GitHub
[go: up one dir, main page]

Skip to content

Commit 26c3e70

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 commit 12cc679) Co-authored-by: Steve Dower <steve.dower@python.org>
1 parent b473d48 commit 26c3e70

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
Lines changed: 2 additions & 0 deletions
  • AAFB
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
<Target Name="FindVCRuntime" Returns="VCRuntimeDLL" DependsOnTargets="FindVCRedistDir">
232-
<ItemGroup Condition="$(VCInstallDir) != ''">
232+
<ItemGroup Condition="$(VCRuntimeDLL) != ''">
233+
<VCRuntimeDLL Include="$(VCRuntimeDLL)" />
234+
</ItemGroup>
235+
<ItemGroup Condition="$(VCInstallDir) != '' and $(VCRuntimeDLL) == ''">
233236
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
234237
</ItemGroup>
235238

0 commit comments

Comments
 (0)
0