Skip to content

Commit 3136f6f

Browse files
bpo-39930: Convert error to warning for more silent failure (GH-18921)
Makes it an error to create a layout without vcruntime DLL (cherry picked from commit fde44ae) Co-authored-by: Steve Dower <[email protected]>
1 parent eede148 commit 3136f6f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

PC/layout/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,12 @@ def in_build(f, dest="", new_name=None):
153153
if ns.include_stable:
154154
yield from in_build(PYTHON_STABLE_DLL_NAME)
155155

156+
found_any = False
156157
for dest, src in rglob(ns.build, "vcruntime*.dll"):
158+
found_any = True
157159
yield dest, src
160+
if not found_any:
161+
log_error("Failed to locate vcruntime DLL in the build.")
158162

159163
yield "LICENSE.txt", ns.source / "LICENSE"
160164

PCbuild/pyproject.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public override bool Execute() {
211211
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
212212
</ItemGroup>
213213

214-
<Error Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" />
214+
<Warning Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" />
215215
<Message Text="VCRuntimeDLL: @(VCRuntimeDLL)" Importance="high" />
216216
</Target>
217217
</Project>

0 commit comments

Comments
 (0)