Refactor library search to include ABI3 support

Author: laramiel

bazel/repo_rules/get_local_runtime_info.py

@@ -140,27 +140,55 @@ def _search_library_names(
   if abi_flags:
     lib_names.append(f"{prefix}python{version}{abi_flags}{shlib_suffix}")
 
+  # Also search for the abi3 libraries.
+  abi3_lib_names = [f"{prefix}python{sys.version_info.major}{shlib_suffix}"]
+  for x in lib_names:
+    if version in x:
+      abi3_lib_names.append(x.replace(version, f"{sys.version_info.major}"))
+
+  lib_names.extend(abi3_lib_names)
   return list(dict.fromkeys(k for k in lib_names if k))
 
 
-def _do_library_search(
-    *,
-    search_directories: list[str],
-    libnames: list[str],
-) -> tuple[dict[str, None], dict[str, None], dict[str, None]]:
-  """Finds existing libnames in search_directories, returning the found libraries."""
+def _get_python_library_info(base_executable) -> dict[str, Any]:
+  """Returns a dictionary with the static and dynamic python libraries."""
+  config_vars = sysconfig.get_config_vars()
+
+  # VERSION is X.Y in Linux/macOS and XY in Windows.  This is used to
+  # construct library paths such as python3.12, so ensure it exists.
+  version = config_vars.get("VERSION")
+  if not version:
+    if _IS_WINDOWS:
+      version = f"{sys.version_info.major}{sys.version_info.minor}"
+    else:
+      version = f"{sys.version_info.major}.{sys.version_info.minor}"
+
+  # sys.abiflags may not exist, but it still may be set in the config.
+  abi_flags = _get_abi_flags(config_vars.get)
+  shlib_suffix = _get_shlib_suffix(config_vars.get)
+  search_directories = _search_directories(config_vars.get, base_executable)
+  search_libnames = _search_library_names(
+      config_vars.get, version, abi_flags, shlib_suffix
+  )
   static_libraries: dict[str, None] = {}
   dynamic_libraries: dict[str, None] = {}
   interface_libraries: dict[str, None] = {}
+  abi_dynamic_libraries: dict[str, None] = {}
+  abi_interface_libraries: dict[str, None] = {}
+
   for root_dir in search_directories:
-    for libname in libnames:
+    for libname in search_libnames:
       # Check whether the library exists.
+      full_abi = version in libname
       composed_path = os.path.join(root_dir, libname)
       if os.path.exists(composed_path) or os.path.isdir(composed_path):
-        if libname.endswith(".a"):
-          static_libraries[composed_path] = None
-        else:
-          dynamic_libraries[composed_path] = None
+        if full_abi:
+          if libname.endswith(".a"):
+            static_libraries[composed_path] = None
+          else:
+            dynamic_libraries[composed_path] = None
+        elif not libname.endswith(".a"):
+          abi_dynamic_libraries[composed_path] = None
 
       interface_path = None
       if libname.endswith(".dll"):
@@ -180,47 +208,10 @@ def _do_library_search(
 
       # Check whether an interface library exists.
       if interface_path and os.path.exists(interface_path):
-        interface_libraries[interface_path] = None
-  return static_libraries, dynamic_libraries, interface_libraries
-
-
-def _get_python_library_info(base_executable) -> dict[str, Any]:
-  """Returns a dictionary with the static and dynamic python libraries."""
-  config_vars = sysconfig.get_config_vars()
-
-  # VERSION is X.Y in Linux/macOS and XY in Windows.  This is used to
-  # construct library paths such as python3.12, so ensure it exists.
-  version = config_vars.get("VERSION")
-  if not version:
-    if _IS_WINDOWS:
-      version = f"{sys.version_info.major}{sys.version_info.minor}"
-    else:
-      version = f"{sys.version_info.major}.{sys.version_info.minor}"
-
-  # sys.abiflags may not exist, but it still may be set in the config.
-  abi_flags = _get_abi_flags(config_vars.get)
-  shlib_suffix = _get_shlib_suffix(config_vars.get)
-  search_directories = _search_directories(config_vars.get, base_executable)
-  search_libnames = _search_library_names(
-      config_vars.get, version, abi_flags, shlib_suffix
-  )
-
-  # Search for the python libraries for the current python interpreter.
-  static_libraries, dynamic_libraries, interface_libraries = _do_library_search(
-      search_directories=search_directories,
-      libnames=search_libnames,
-  )
-
-  # Search for major version abi libraries which must be dynamic.
-  abi_search_libnames = [
-      s.replace(version, f"{sys.version_info.major}")
-      for s in search_libnames
-      if version in s
-  ]
-  _, abi_dynamic_libraries, abi_interface_libraries = _do_library_search(
-      search_directories=search_directories,
-      libnames=abi_search_libnames,
-  )
+        if full_abi:
+          interface_libraries[interface_path] = None
+        else:
+          abi_interface_libraries[interface_path] = None
 
   # Additional DLLs are needed on Windows to link properly.
   dlls = []