From 7da595130c61429c09a81121c78a41b7b070fe49 Mon Sep 17 00:00:00 2001 From: Nicholas Junge Date: Fri, 22 Mar 2024 15:17:07 +0100 Subject: [PATCH] Add libs/python3.lib to libpython target for SABI builds on Windows When targeting the Python Stable ABI on Windows (by setting the Py_LIMITED_API macro to a Python minimum version hex), the unversioned python3.lib needs to be linked instead of the versioned one (e.g. python38.lib for Python 3.8). Python's own config sets the library to link by default in a header called pyconfig.h (https://github.com/python/cpython/blob/9cc9e277254023c0ca08e1a9e379fd89475ca9c2/PC/pyconfig.h#L270), which prompts the linker to search for python3.lib if a stable ABI extension is built using `@rules_python` toolchains. Since this library is not exported on Windows in the `python_repository()` rule, it's added now to allow Python SABI extensions to be built (and linked) on Windows with `@rules_python`. Since Python takes responsibility for linking the correct lib on Windows, and never both at the same time, no other changes are made. --- CHANGELOG.md | 3 +++ python/repositories.bzl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff61b2be2c..645003328a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,9 @@ A brief description of the categories of changes: * (gazelle) In `project` or `package` generation modes, do not generate `py_test` rules when there are no test files and do not set `main = "__test__.py"` when that file doesn't exist. +* (repositories): Add libs/python3.lib and pythonXY.dll to the `libpython` target + defined by a repository template. This enables stable ABI builds of Python extensions + on Windows (by defining Py_LIMITED_API). ### Added diff --git a/python/repositories.bzl b/python/repositories.bzl index aab68eb086..183e17fcfb 100644 --- a/python/repositories.bzl +++ b/python/repositories.bzl @@ -319,7 +319,7 @@ cc_library( name = "libpython", hdrs = [":includes"], srcs = select({{ - "@platforms//os:windows": ["python3.dll", "libs/python{python_version_nodot}.lib"], + "@platforms//os:windows": ["python3.dll", "python{python_version_nodot}.dll", "libs/python3.lib", "libs/python{python_version_nodot}.lib"], "@platforms//os:macos": ["lib/libpython{python_version}.dylib"], "@platforms//os:linux": ["lib/libpython{python_version}.so", "lib/libpython{python_version}.so.1.0"], }}),