Skip to content

Commit 2ab62b6

Browse files
committed
Add missing toolchain arguments
1 parent c6fa4e4 commit 2ab62b6

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

go/private/actions/compilepkg.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ def _run_nogo(
284284
outputs = [out_validation],
285285
mnemonic = "ValidateNogo",
286286
executable = go.toolchain._builder,
287+
toolchain = GO_TOOLCHAIN_LABEL,
287288
arguments = [validation_args],
288289
execution_requirements = SUPPORTS_PATH_MAPPING_REQUIREMENT,
289290
progress_message = "Validating nogo output for %{label}",

go/private/rules/binary.bzl

+4-2
Original file line numberDiff line numberDiff line change
@@ -510,10 +510,11 @@ exit /b %GO_EXIT_CODE%
510510
)
511511
ctx.actions.run(
512512
executable = bat,
513-
inputs = depset(
513+
tools = depset(
514514
ctx.files.srcs + [sdk.go],
515515
transitive = [sdk.headers, sdk.srcs, sdk.tools],
516516
),
517+
toolchain = GO_TOOLCHAIN,
517518
outputs = [out, gotmp],
518519
mnemonic = "GoToolchainBinaryBuild",
519520
)
@@ -536,10 +537,11 @@ GO111MODULE=off \
536537
)
537538
ctx.actions.run_shell(
538539
command = cmd,
539-
inputs = depset(
540+
tools = depset(
540541
ctx.files.srcs + [sdk.go],
541542
transitive = [sdk.headers, sdk.srcs, sdk.libs, sdk.tools],
542543
),
544+
toolchain = GO_TOOLCHAIN,
543545
outputs = [out],
544546
mnemonic = "GoToolchainBinaryBuild",
545547
)

go/private/rules/nogo.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def _nogo_impl(ctx):
5757
outputs = [nogo_main],
5858
mnemonic = "GoGenNogo",
5959
executable = go.toolchain._builder,
60+
toolchain = GO_TOOLCHAIN,
6061
arguments = [nogo_args],
6162
)
6263

0 commit comments

Comments
 (0)