From 32acb28652d9d76996b68d7d357290819b6f8288 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 10 Dec 2025 19:45:33 +0000 Subject: [PATCH] Fix tools with remote exec Previously the shared libs that are part of implicit_deps were not uploaded to remote exec spawns. I'm still confused about which one we "should" be using here, but this seems to work. --- mojo/toolchain.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mojo/toolchain.bzl b/mojo/toolchain.bzl index a89fc4b..c7f7b1f 100644 --- a/mojo/toolchain.bzl +++ b/mojo/toolchain.bzl @@ -4,10 +4,10 @@ load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("//mojo:providers.bzl", "MojoInfo", "MojoToolchainInfo") def _mojo_toolchain_impl(ctx): - tool_files = [ctx.attr.mojo[DefaultInfo].files] - for dep in ctx.attr.implicit_deps + ctx.attr.extra_tools + [ctx.attr.lld]: + tool_files = [] + for dep in ctx.attr.implicit_deps + ctx.attr.extra_tools + [ctx.attr.lld, ctx.attr.mojo]: tool_files.append(dep[DefaultInfo].default_runfiles.files) - tool_files.append(dep[DefaultInfo].files_to_run) + tool_files.append(dep[DefaultInfo].files) copts = list(ctx.attr.copts) gpu_toolchain = ctx.toolchains["//:gpu_toolchain_type"]