Update expected release distributions

ci-targets.yaml

@@ -11,7 +11,13 @@ darwin:
       - "3.14"
       - "3.15"
     build_options:
+      - debug
       - pgo+lto
+    build_options_conditional:
+      - options:
+          - freethreaded+debug
+          - freethreaded+pgo+lto
+        minimum-python-version: "3.13"
 
   x86_64-apple-darwin:
     arch: x86_64
@@ -23,7 +29,13 @@ darwin:
       - "3.14"
       - "3.15"
     build_options:
+      - debug
       - pgo+lto
+    build_options_conditional:
+      - options:
+          - freethreaded+debug
+          - freethreaded+pgo+lto
+        minimum-python-version: "3.13"
     run: true
 
 linux:
@@ -38,7 +50,13 @@ linux:
       - "3.14"
       - "3.15"
     build_options:
+      - debug
       - pgo+lto
+    build_options_conditional:
+      - options:
+          - freethreaded+debug
+          - freethreaded+pgo+lto
+        minimum-python-version: "3.13"
 
   x86_64-unknown-linux-gnu:
     arch: x86_64
@@ -51,7 +69,13 @@ linux:
       - "3.14"
       - "3.15"
     build_options:
+      - debug
       - pgo+lto
+    build_options_conditional:
+      - options:
+          - freethreaded+debug
+          - freethreaded+pgo+lto
+        minimum-python-version: "3.13"
     run: true
 
   x86_64-unknown-linux-musl:
@@ -65,7 +89,18 @@ linux:
       - "3.14"
       - "3.15"
     build_options:
+      - debug+static
+      - noopt+static
       - lto+static
+      - debug
+      - noopt
+      - lto
+    build_options_conditional:
+      - options:
+          - freethreaded+debug
+          - freethreaded+noopt
+          - freethreaded+lto
+        minimum-python-version: "3.13"
     run: true
 
   aarch64-unknown-linux-musl:
@@ -79,7 +114,19 @@ linux:
       - "3.14"
       - "3.15"
     build_options:
+      # TODO: Static support is current blocked by some compiler-rt linking issues
+      # - debug+static
+      # - noopt+static
+      # - lto+static
+      - debug
+      - noopt
       - lto
+    build_options_conditional:
+      - options:
+          - freethreaded+debug
+          - freethreaded+noopt
+          - freethreaded+lto
+        minimum-python-version: "3.13"
     run: true
 
 windows:
@@ -96,6 +143,10 @@ windows:
     vs_version: "2022"
     build_options:
       - pgo
+    build_options_conditional:
+      - options:
+          - freethreaded+pgo
+        minimum-python-version: "3.14"
 
   x86_64-pc-windows-msvc:
     arch: x86_64
@@ -113,6 +164,10 @@ windows:
       minimum-python-version: "3.15"
     build_options:
       - pgo
+    build_options_conditional:
+      - options:
+          - freethreaded+pgo
+        minimum-python-version: "3.14"
 
   aarch64-pc-windows-msvc:
     arch: aarch64
@@ -128,3 +183,7 @@ windows:
     vs_version: "2022"
     build_options:
       - pgo
+    build_options_conditional:
+      - options:
+          - freethreaded+pgo
+        minimum-python-version: "3.14"

cpython-windows/build.py

@@ -1387,20 +1387,9 @@ def find_additional_dependencies(project: pathlib.Path):
 
         return set()
 
-    if arch == "amd64":
-        abi_platform = "win_amd64"
-    elif arch == "win32":
-        abi_platform = "win32"
-    elif arch == "arm64":
-        abi_platform = "win_arm64"
-    else:
-        raise Exception("unhandled architecture: %s" % arch)
-
     if freethreaded:
-        abi_tag = ".cp%st-%s" % (python_majmin, abi_platform)
         lib_suffix = "t"
     else:
-        abi_tag = ""
         lib_suffix = ""
 
     # Copy object files for core sources into their own directory.
@@ -1515,15 +1504,14 @@ def find_additional_dependencies(project: pathlib.Path):
         res["extensions"][ext] = [entry]
 
         # Copy the extension static library.
-        ext_static = outputs_path / ("%s%s.lib" % (ext, abi_tag))
-        dest = dest_dir / ("%s%s.lib" % (ext, abi_tag))
+        ext_static = outputs_path / ("%s.lib" % ext)
+        dest = dest_dir / ("%s.lib" % ext)
         log("copying static extension %s" % ext_static)
         shutil.copyfile(ext_static, dest)
 
-        res["extensions"][ext][0]["static_lib"] = "build/extensions/%s/%s%s.lib" % (
+        res["extensions"][ext][0]["static_lib"] = "build/extensions/%s/%s.lib" % (
             ext,
             ext,
-            abi_tag,
         )
 
     lib_dir = out_dir / "build" / "lib"