From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:38:31 +0000 (+0200)
Subject: gh-119679: Fix layout of PYD and DLL files on Windows when using PC/layout script... 
X-Git-Tag: v3.13.0b3~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbdff3803af23f632469933e33ee735f853bbdec;p=thirdparty%2FPython%2Fcpython.git

gh-119679: Fix layout of PYD and DLL files on Windows when using PC/layout script (GH-120133)

(cherry picked from commit cccc9f63c63ae693ccd0e2d8fc6cfd3aa18feb8e)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/PC/layout/main.py b/PC/layout/main.py
index 716f01097fe3..0350ed7af3f9 100644
--- a/PC/layout/main.py
+++ b/PC/layout/main.py
@@ -202,7 +202,7 @@ def get_layout(ns):
 
     yield "LICENSE.txt", ns.build / "LICENSE.txt"
 
-    dest="" if ns.flat_dlls else "DLLs/"
+    dest = "" if ns.flat_dlls else "DLLs/"
 
     for _, src in rglob(ns.build, "*.pyd"):
         if ns.include_freethreaded:
@@ -226,7 +226,7 @@ def get_layout(ns):
             continue
         if src in EXCLUDE_FROM_DLLS:
             continue
-        yield from in_build(src.name, no_lib=True)
+        yield from in_build(src.name, dest=dest, no_lib=True)
 
     if ns.zip_lib:
         zip_name = PYTHON_ZIP_NAME