Skip to content

Commit

Permalink
[3.11] gh-110437: Allow overriding VCRuntimeDLL with a semicolon sepa…
Browse files Browse the repository at this point in the history
…rated 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>
  • Loading branch information
miss-islington and zooba committed Oct 9, 2023
1 parent b473d48 commit 26c3e70
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
@@ -0,0 +1,2 @@
Allows overriding the source of VC redistributables so that releases can be
guaranteed to never downgrade between updates.
5 changes: 4 additions & 1 deletion PCbuild/pyproject.props
Expand Up @@ -229,7 +229,10 @@ public override bool Execute() {
</Target>

<Target Name="FindVCRuntime" Returns="VCRuntimeDLL" DependsOnTargets="FindVCRedistDir">
<ItemGroup Condition="$(VCInstallDir) != ''">
<ItemGroup Condition="$(VCRuntimeDLL) != ''">
<VCRuntimeDLL Include="$(VCRuntimeDLL)" />
</ItemGroup>
<ItemGroup Condition="$(VCInstallDir) != '' and $(VCRuntimeDLL) == ''">
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
</ItemGroup>

Expand Down

0 comments on commit 26c3e70

Please sign in to comment.