Skip to content

Commit 13ad121

Browse files
[3.12] 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 <[email protected]>
1 parent b2419ef commit 13ad121

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
@@ -232,7 +232,10 @@ public override bool Execute() {
232232
</Target>
233233

234234
<Target Name="FindVCRuntime" Returns="VCRuntimeDLL" DependsOnTargets="FindVCRedistDir">
235-
<ItemGroup Condition="$(VCInstallDir) != ''">
235+
<ItemGroup Condition="$(VCRuntimeDLL) != ''">
236+
<VCRuntimeDLL Include="$(VCRuntimeDLL)" />
237+
</ItemGroup>
238+
<ItemGroup Condition="$(VCInstallDir) != '' and $(VCRuntimeDLL) == ''">
236239
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
237240
</ItemGroup>
238241

0 commit comments

Comments
 (0)