Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions diff/private/diff.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
load("//diff/private:options.bzl", "DiffOptionsInfo")

# We run diff in actions, so we want to use the execution platform toolchain.
DIFF_TOOLCHAIN_TYPE = "@diff.bzl//diff/toolchain:execution_type"
DIFFUTILS_TOOLCHAIN_TYPE = "@diff.bzl//diff/toolchain:execution_type"

def _validate_diff_binary(ctx):
"""Validate that the diff binary is GNU diffutils.
Expand All @@ -18,7 +18,7 @@ def _validate_diff_binary(ctx):
The output file containing the validation result, which must be placed in a _validation output group.
"""
is_bsd_diff = ctx.actions.declare_file(ctx.label.name + ".is_bsd_diff")
diffinfo = ctx.toolchains[DIFF_TOOLCHAIN_TYPE].diffinfo
diffinfo = ctx.toolchains[DIFFUTILS_TOOLCHAIN_TYPE].diffinfo
ctx.actions.run_shell(
inputs = diffinfo.tool_files,
outputs = [is_bsd_diff],
Expand Down Expand Up @@ -54,7 +54,7 @@ def _validate_exit_code(ctx, exit_code_file, error_message = "Diff exited with b
return exit_code_valid

def _diff_rule_impl(ctx):
diffinfo = ctx.toolchains[DIFF_TOOLCHAIN_TYPE].diffinfo
diffinfo = ctx.toolchains[DIFFUTILS_TOOLCHAIN_TYPE].diffinfo
command = "{} {} {} {} > {}; echo $? > {}".format(
diffinfo.diff_path,
" ".join(ctx.attr.args),
Expand Down Expand Up @@ -131,5 +131,5 @@ diff_rule = rule(
),
"_options": attr.label(default = "//diff:diff_options"),
},
toolchains = [DIFF_TOOLCHAIN_TYPE],
toolchains = [DIFFUTILS_TOOLCHAIN_TYPE],
)
6 changes: 3 additions & 3 deletions diff/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DiffutilsInfo = provider(
},
)

def _diff_toolchain_impl(ctx):
def _diffutils_toolchain_impl(ctx):
if ctx.attr.diff_tool and ctx.attr.diff_path:
fail("Can only set one of diff_tool or diff_path but both were set.")
if not ctx.attr.diff_tool and not ctx.attr.diff_path:
Expand Down Expand Up @@ -51,8 +51,8 @@ def _diff_toolchain_impl(ctx):
template_variables,
]

diff_toolchain = rule(
implementation = _diff_toolchain_impl,
diffutils_toolchain = rule(
implementation = _diffutils_toolchain_impl,
attrs = {
"diff_tool": attr.label(
doc = "A hermetically downloaded executable target for the target platform.",
Expand Down
4 changes: 2 additions & 2 deletions e2e/smoke/tools/toolchains/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@diff.bzl//diff:toolchain.bzl", "diff_toolchain")
load("@diff.bzl//diff:toolchain.bzl", "diffutils_toolchain")

diff_toolchain(
diffutils_toolchain(
name = "diffutils_toolchain",
diff_path = "/usr/bin/diff",
)
Expand Down
4 changes: 2 additions & 2 deletions tools/toolchains/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@diff.bzl//diff:toolchain.bzl", "diff_toolchain")
load("@diff.bzl//diff:toolchain.bzl", "diffutils_toolchain")

diff_toolchain(
diffutils_toolchain(
name = "diffutils_toolchain",
diff_tool = "@diffutils//:diff",
)
Expand Down