diff options
| author | Steve Dower <steve.dower@python.org> | 2023-10-09 11:17:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-09 11:17:42 (GMT) |
| commit | 12cc6792d0ca1d0b72712d77c6efcb0aa0c7e7ba (patch) | |
| tree | 3cdaf548b9837695085d311e3b3d37d95162f0a6 | |
| parent | ea39c877c0a8e7a717f2e4bf7d92a3a8780e67c0 (diff) | |
| download | cpython-12cc6792d0ca1d0b72712d77c6efcb0aa0c7e7ba.zip cpython-12cc6792d0ca1d0b72712d77c6efcb0aa0c7e7ba.tar.gz cpython-12cc6792d0ca1d0b72712d77c6efcb0aa0c7e7ba.tar.bz2 | |
gh-110437: Allow overriding VCRuntimeDLL with a semicolon separated list of DLLs to bundle (GH-110470)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst b/Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst new file mode 100644 index 0000000..777b494 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst @@ -0,0 +1,2 @@ +Allows overriding the source of VC redistributables so that releases can be +guaranteed to never downgrade between updates. diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 9db400e..b8d2d3d 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -233,7 +233,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> |