fix local toolchain

Author: rickeylev

python/private/hermetic_runtime_repo_setup.bzl

@@ -243,7 +243,10 @@ def define_hermetic_runtime_toolchain_impl(
         # On Windows, a symlink-style venv requires supporting .dll files.
         venv_bin_files = select({
             "@platforms//os:windows": native.glob(
-                include = ["*.dll", "*.pdb"],
+                include = ["*.dll"],
+                allow_empty = False,
+            ) + native.glob(
+                include = ["*.pdb"],
                 allow_empty = True,
             ),
             "//conditions:default": [],

python/private/local_runtime_repo.bzl

@@ -74,19 +74,19 @@ def _norm_path(path):
 def _symlink_libraries(rctx, logger, libraries, shlib_suffix):
     """Symlinks the shared libraries into the lib/ directory.
 
+    Individual files are symlinked instead of the whole directory because
+    shared_lib_dirs contains multiple search paths for the shared libraries,
+    and the python files may be missing from any of those directories, and
+    any of those directories may include non-python runtime libraries,
+    as would be the case if LIBDIR were, for example, /usr/lib.
+
     Args:
         rctx: A repository_ctx object
         logger: A repo_utils.logger object
         libraries: paths to libraries to attempt to symlink.
         shlib_suffix: Optional. Ensure that the generated symlinks end with this suffix.
     Returns:
         A list of library paths (under lib/) linked by the action.
-
-    Individual files are symlinked instead of the whole directory because
-    shared_lib_dirs contains multiple search paths for the shared libraries,
-    and the python files may be missing from any of those directories, and
-    any of those directories may include non-python runtime libraries,
-    as would be the case if LIBDIR were, for example, /usr/lib.
     """
     result = []
     for source in libraries:

python/private/local_runtime_repo_setup.bzl

@@ -153,6 +153,16 @@ def define_local_runtime_toolchain_impl(
         implementation_name = implementation_name,
         abi_flags = abi_flags,
         pyc_tag = "{}-{}{}{}".format(implementation_name, major, minor, abi_flags),
+        venv_bin_files = select({
+            "@platforms//os:windows": native.glob(
+                include = ["lib/*.dll"],
+                allow_empty = False,
+            ) + native.glob(
+                include = ["lib/*.pdb"],
+                allow_empty=True,
+            ),
+            "//conditions:default": [],
+        }),
     )
 
     py_runtime_pair(

python/private/py_executable.bzl

@@ -723,16 +723,17 @@ def _create_venv_windows(ctx, *, venv_root, runtime, interpreter_actual_path):
         interpreter = ctx.actions.declare_file("{}/{}".format(bin_dir, py_exe_basename))
         interpreter_runfiles.add(interpreter)
         ctx.actions.symlink(output = interpreter, target_file = runtime.interpreter)
-        for f in runtime.venv_bin_files:
-            venv_path = "{}/{}".format(bin_dir, f.basename)
-            venv_file = ctx.actions.declare_file(venv_path)
-            ctx.actions.symlink(output = venv_file, target_file = f)
-            interpreter_runfiles.add(venv_file)
     else:
         interpreter = ctx.actions.declare_symlink("{}/{}".format(bin_dir, py_exe_basename))
         interpreter_runfiles.add(interpreter)
         ctx.actions.symlink(output = interpreter, target_path = runtime.interpreter_path)
 
+    for f in runtime.venv_bin_files:
+        venv_path = "{}/{}".format(bin_dir, f.basename)
+        venv_file = ctx.actions.declare_file(venv_path)
+        ctx.actions.symlink(output = venv_file, target_file = f)
+        interpreter_runfiles.add(venv_file)
+
     # See site.py logic: Windows uses a version/build agnostic site-packages path
     venv_site_packages = "Lib/site-packages"
 

python/private/repo_utils.bzl

@@ -311,12 +311,19 @@ def _which_unchecked(mrctx, binary_name):
     )
 
 def _which_describe_failure(binary_name, path):
+    if "\\" in path or ";" in path:
+        path_parts = path.split(";")
+    else:
+        path_parts = path.split(":")
+    for i, v in enumerate(path_parts):
+        path_parts[i] = "  [{}]: {}".format(i, v)
     return (
         "Unable to find the binary '{binary_name}' on PATH.\n" +
-        "  PATH = {path}"
+        "  PATH entries:\n" +
+        "{path_str}"
     ).format(
         binary_name = binary_name,
-        path = path,
+        path_str = "\n".join(path_parts)
     )
 
 def _mkdir(mrctx, path):