fix/handle missing interpreter in bin

Author: rickeylev

python/private/py_executable.bzl

@@ -662,7 +662,6 @@ def _create_venv_unixy(ctx, *, venv_root, runtime, interpreter_actual_path):
             # needed or used at runtime. However, the zip code uses the interpreter
             # File object to figure out some paths.
             interpreter = ctx.actions.declare_file("{}/{}".format(bin_dir, py_exe_basename))
-
             ctx.actions.write(interpreter, "actual:{}".format(interpreter_actual_path))
 
         elif runtime.interpreter:
@@ -671,6 +670,7 @@ def _create_venv_unixy(ctx, *, venv_root, runtime, interpreter_actual_path):
             # in runfiles is always a symlink. An RBE implementation, for example,
             # may choose to write what symlink() points to instead.
             interpreter = ctx.actions.declare_symlink("{}/{}".format(bin_dir, py_exe_basename))
+            interpreter_runfiles.add(interpreter)
 
             rel_path = relative_path(
                 # dirname is necessary because a relative symlink is relative to
@@ -681,6 +681,7 @@ def _create_venv_unixy(ctx, *, venv_root, runtime, interpreter_actual_path):
             ctx.actions.symlink(output = interpreter, target_path = rel_path)
         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)
     else:
         interpreter = None

python/private/python_bootstrap_template.txt

@@ -144,10 +144,9 @@ def search_path(name):
 def find_python_binary(runfiles_root):
   """Finds the real Python binary if it's not a normal absolute path."""
   if PYTHON_BINARY:
-    bin_path = find_binary(runfiles_root, PYTHON_BINARY)
+    return find_binary(runfiles_root, PYTHON_BINARY)
   else:
-    bin_path = find_binary(runfiles_root, PYTHON_BINARY_ACTUAL)
-  return bin_path
+    return find_binary(runfiles_root, PYTHON_BINARY_ACTUAL)
 
 
 def print_verbose(*args, mapping=None, values=None):
@@ -353,13 +352,16 @@ print(site.getsitepackages(["{venv_src}"])[-1])
             target = join(python_home, f)
             _symlink_exist_ok(from_=venv_path, to=target)
 
-    # Re-add all the entries under bin/, which includes supporting
-    # .dll files when under windows.
     runfiles_venv_bin = join(runfiles_venv, BIN_DIR_NAME)
-    for f_basename in os.listdir(runfiles_venv_bin):
-        venv_path = join(venv, BIN_DIR_NAME, f_basename)
-        target = join(runfiles_venv_bin, f_basename)
-        _symlink_exist_ok(from_=venv_path, to=target)
+    # The runfiles bin directory may not exist if
+    # supports_build_time_venv=False and the interpreter is resolved at runtime.
+    if os.path.exists(runfiles_venv_bin):
+      # Re-add all the entries under bin/, which includes supporting
+      # .dll files when under windows.
+      for f_basename in os.listdir(runfiles_venv_bin):
+          venv_path = join(venv, BIN_DIR_NAME, f_basename)
+          target = join(runfiles_venv_bin, f_basename)
+          _symlink_exist_ok(from_=venv_path, to=target)
 
     _symlink_exist_ok(from_=join(venv, "lib"), to=join(runfiles_venv, "lib"))
     _symlink_exist_ok(from_=venv_site_packages, to=runfiles_venv_site_packages)