Add missing toolchain arguments

bazel-contrib · Nov 14, 2024 · 2ab62b6 · 2ab62b6
1 parent c6fa4e4
commit 2ab62b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/go/private/actions/compilepkg.bzl b/go/private/actions/compilepkg.bzl
@@ -284,6 +284,7 @@ def _run_nogo(
         outputs = [out_validation],
         mnemonic = "ValidateNogo",
         executable = go.toolchain._builder,
+        toolchain = GO_TOOLCHAIN_LABEL,
         arguments = [validation_args],
         execution_requirements = SUPPORTS_PATH_MAPPING_REQUIREMENT,
         progress_message = "Validating nogo output for %{label}",

diff --git a/go/private/rules/binary.bzl b/go/private/rules/binary.bzl
@@ -510,10 +510,11 @@ exit /b %GO_EXIT_CODE%
         )
         ctx.actions.run(
             executable = bat,
-            inputs = depset(
+            tools = depset(
                 ctx.files.srcs + [sdk.go],
                 transitive = [sdk.headers, sdk.srcs, sdk.tools],
             ),
+            toolchain = GO_TOOLCHAIN,
             outputs = [out, gotmp],
             mnemonic = "GoToolchainBinaryBuild",
         )
@@ -536,10 +537,11 @@ GO111MODULE=off \
         )
         ctx.actions.run_shell(
             command = cmd,
-            inputs = depset(
+            tools = depset(
                 ctx.files.srcs + [sdk.go],
                 transitive = [sdk.headers, sdk.srcs, sdk.libs, sdk.tools],
             ),
+            toolchain = GO_TOOLCHAIN,
             outputs = [out],
             mnemonic = "GoToolchainBinaryBuild",
         )

diff --git a/go/private/rules/nogo.bzl b/go/private/rules/nogo.bzl
@@ -57,6 +57,7 @@ def _nogo_impl(ctx):
         outputs = [nogo_main],
         mnemonic = "GoGenNogo",
         executable = go.toolchain._builder,
+        toolchain = GO_TOOLCHAIN,
         arguments = [nogo_args],
     )