local toolchain fix

Author: rickeylev

python/private/get_local_runtime_info.py

@@ -22,6 +22,7 @@
     "micro": sys.version_info.micro,
     "include": sysconfig.get_path("include"),
     "implementation_name": sys.implementation.name,
+    "base_executable": sys._base_executable,
 }
 
 config_vars = [

python/private/local_runtime_repo.bzl

@@ -84,6 +84,12 @@ def _local_runtime_repo_impl(rctx):
     info = json.decode(exec_result.stdout)
     logger.info(lambda: _format_get_info_result(info))
 
+    # The base executable is the final, actual, underlying interpreter.
+    # If an intermediate wrapper is used, then it can cause venvs to not
+    # be recognized as active.
+    interpreter_path = info["base_executable"]
+    print("===", interpreter_path)
+
     # NOTE: Keep in sync with recursive glob in define_local_runtime_toolchain_impl
     repo_utils.watch_tree(rctx, rctx.path(info["include"]))
 

tests/integration/local_toolchains/test.py

@@ -15,20 +15,13 @@ def test_python_from_path_used(self):
         # The shim is e.g. /home/user/.pyenv/shims/python3, which then
         # runs e.g. /usr/bin/python3
         expected = subprocess.check_output(
-            [shell_path, "-c", "import os, sys; print(os.path.realpath(sys._base_executable))"],
+            [shell_path, "-c", "import os, sys; print(sys._base_executable)"],
             text=True,
         )
         expected = expected.strip().lower()
 
-        msg = "\n".join([
-                "other values:",
-                f"{shell_path=}",
-                f"{sys.executable=}",
-                f"{sys._base_executable=}",
-        ])
         # Normalize case: Windows may have case differences
-        self.assertEqual(expected.lower(), sys._base_executable.lower(),
-                         msg = msg)
+        self.assertEqual(expected.lower(), sys._base_executable.lower())
 
 
 if __name__ == "__main__":