Update py_executable.bzl

Author: fmeum

python/private/py_executable.bzl

@@ -783,8 +783,8 @@ def _create_stage1_bootstrap(
 
 def _find_launcher_maker(ctx):
     if rp_config.bazel_9_or_later:
-        return ctx.toolchains[_LAUNCHER_MAKER_TOOLCHAIN_TYPE].binary
-    return ctx.executable._windows_launcher_maker
+        return (ctx.toolchains[_LAUNCHER_MAKER_TOOLCHAIN_TYPE].binary, _LAUNCHER_MAKER_TOOLCHAIN_TYPE)
+    return (ctx.executable._windows_launcher_maker, None)
 
 def _create_windows_exe_launcher(
         ctx,
@@ -805,15 +805,17 @@ def _create_windows_exe_launcher(
     launch_info.add("1" if use_zip_file else "0", format = "use_zip_file=%s")
 
     launcher = ctx.attr._launcher[DefaultInfo].files_to_run.executable
+    executable, toolchain = _find_launcher_maker(ctx)
     ctx.actions.run(
-        executable = _find_launcher_maker(ctx),
+        executable = executable,
         arguments = [launcher.path, launch_info, output.path],
         inputs = [launcher],
         outputs = [output],
         mnemonic = "PyBuildLauncher",
         progress_message = "Creating launcher for %{label}",
         # Needed to inherit PATH when using non-MSVC compilers like MinGW
         use_default_shell_env = True,
+        toolchain = toolchain,
     )
 
 def _create_zip_file(ctx, *, output, zip_main, runfiles):

tests/base_rules/py_executable_base_tests.bzl

@@ -125,16 +125,18 @@ def _test_cross_compile_to_unix(name, config):
         name = name,
         impl = _test_cross_compile_to_unix_impl,
         target = name + "_subject",
+        # Cross-compilation of py_test fails since the default test toolchain
+        # requires an execution platform that matches the target platform.
         config_settings = {
             "//command_line_option:platforms": [platform_targets.EXOTIC_UNIX],
-        },
+        } if rp_config.bazel_9_or_later and not "py_test" in str(config.rule) else {},
         expect_failure = True,
     )
 
 def _test_cross_compile_to_unix_impl(_env, _target):
     pass
 
-_tests.append(_test_cross_compile_to_unix) if rp_config.bazel_9_or_later else None
+_tests.append(_test_cross_compile_to_unix)
 
 def _test_executable_in_runfiles(name, config):
     rt_util.helper_target(