Add additional_dlls parameter to local_runtime_repo_setup

Author: laramiel

bazel/repo_rules/local_runtime_repo_setup.bzl

@@ -17,6 +17,7 @@
 # See https://github.com/bazel-contrib/rules_python/pull/3148
 """Setup code called by the code generated by `local_runtime_repo`."""
 
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@rules_cc//cc:cc_import.bzl", "cc_import")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
@@ -39,7 +40,8 @@ def define_local_runtime_toolchain_impl(
         interface_library,
         libraries,
         abi3_interface_library,
-        abi3_libraries):
+        abi3_libraries,
+        additional_dlls):
     """Defines a toolchain implementation for a local Python runtime.
 
     Generates public targets:
@@ -70,6 +72,8 @@ def define_local_runtime_toolchain_impl(
             e.g. "lib/python3.lib"
         abi3_libraries: `list[str]` Path[s] to the python libraries.
             e.g. ["lib/python3.dll"] or ["lib/python3.so"]
+        additional_dlls: `list[str]` Path[s] to additional DLLs.
+            e.g. ["lib/python3.dll"] or ["lib/python3.so"]
     """
     major_minor = "{}.{}".format(major, minor)
     major_minor_micro = "{}.{}".format(major_minor, micro)
@@ -94,6 +98,15 @@ def define_local_runtime_toolchain_impl(
         )
         abi3_deps.append(":abi3_interface")
 
+    for dll in additional_dlls:
+        name = paths.basename(dll).replace(".", "_")
+        cc_import(
+            name = name,
+            shared_library = dll,
+        )
+        libraries.append(":" + name)
+        abi3_libraries.append(":" + name)
+
     native.filegroup(
         name = "includes",
         srcs = native.glob(
@@ -124,7 +137,7 @@ def define_local_runtime_toolchain_impl(
     )
 
     cc_library(
-        name = "libpython{}".format(major_minor),
+        name = "libpython{}{}".format(major, minor),
         hdrs = [":includes"],
         srcs = libraries,
     )
@@ -159,7 +172,7 @@ def define_local_runtime_toolchain_impl(
         name = "py_cc_toolchain",
         headers = ":python_headers",
         # headers_abi3 = ":python_headers_abi3",
-        libs = ":libpython{}".format(major_minor),
+        libs = ":libpython{}{}".format(major, minor),
         python_version = major_minor_micro,
         visibility = ["//visibility:public"],
     )