mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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 12cc6792d0)

Co-authored-by: Steve Dower <steve.dower@python.org>
This commit is contained in:
Miss Islington (bot) 2023-10-09 13:42:57 +02:00 committed by GitHub
parent b473d48505
commit 26c3e700b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst Normal file
View File

@ -0,0 +1,2 @@
Allows overriding the source of VC redistributables so that releases can be
guaranteed to never downgrade between updates.

5
PCbuild/pyproject.props
View File

@ -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>