Skip to content

Commit

Permalink
Add missing toolchain arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
fmeum committed Nov 15, 2024
1 parent 7b42920 commit ac4432c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protoc_toolchains(
version = "v25.3",
)

# An up-to-date version is required by com_google_protobuf 27.0 below.
# An up-to-date version is required by com_google_protobuf below.
http_archive(
name = "rules_python",
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
Expand Down
1 change: 1 addition & 0 deletions go/private/actions/compilepkg.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down
6 changes: 4 additions & 2 deletions go/private/rules/binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = None,
outputs = [out, gotmp],
mnemonic = "GoToolchainBinaryBuild",
)
Expand All @@ -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 = None,
outputs = [out],
mnemonic = "GoToolchainBinaryBuild",
)
Expand Down
1 change: 1 addition & 0 deletions go/private/rules/nogo.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def _nogo_impl(ctx):
outputs = [nogo_main],
mnemonic = "GoGenNogo",
executable = go.toolchain._builder,
toolchain = GO_TOOLCHAIN,
arguments = [nogo_args],
)

Expand Down

0 comments on commit ac4432c

Please sign in to comment.