Skip to content

Commit

Permalink
use exec_tools instead of tools for better RBE compatibility (#4837)
Browse files Browse the repository at this point in the history
  • Loading branch information
kjlubick authored Jul 5, 2022
1 parent 32622ba commit 6803cc5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ genrule(
outs = ["generators.inc"],
cmd = "$(location generate_registry_tables) --xml=$(location @spirv_headers//:spirv_xml_registry) --generator-output=$(location generators.inc)",
cmd_bat = "$(location //:generate_registry_tables) --xml=$(location @spirv_headers//:spirv_xml_registry) --generator-output=$(location generators.inc)",
tools = [":generate_registry_tables"],
exec_tools = [":generate_registry_tables"],
)

py_binary(
Expand All @@ -96,7 +96,7 @@ genrule(
outs = ["build-version.inc"],
cmd = "SOURCE_DATE_EPOCH=0 $(location update_build_version) $(location CHANGES) $(location build-version.inc)",
cmd_bat = "set SOURCE_DATE_EPOCH=0 && $(location //:update_build_version) $(location CHANGES) $(location build-version.inc)",
tools = [":update_build_version"],
exec_tools = [":update_build_version"],
)

# Libraries
Expand Down
12 changes: 6 additions & 6 deletions build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def generate_core_tables(version = None):
"--core-insts-output=$(location {3}) " +
"--operand-kinds-output=$(location {4})"
).format(*fmtargs),
tools = [":generate_grammar_tables"],
exec_tools = [":generate_grammar_tables"],
visibility = ["//visibility:private"],
)

Expand Down Expand Up @@ -113,7 +113,7 @@ def generate_enum_string_mapping(version = None):
"--extension-enum-output=$(location {3}) " +
"--enum-string-mapping-output=$(location {4})"
).format(*fmtargs),
tools = [":generate_grammar_tables"],
exec_tools = [":generate_grammar_tables"],
visibility = ["//visibility:private"],
)

Expand All @@ -139,7 +139,7 @@ def generate_opencl_tables(version = None):
"--extinst-opencl-grammar=$(location {0}) " +
"--opencl-insts-output=$(location {1})"
).format(*fmtargs),
tools = [":generate_grammar_tables"],
exec_tools = [":generate_grammar_tables"],
visibility = ["//visibility:private"],
)

Expand All @@ -165,7 +165,7 @@ def generate_glsl_tables(version = None):
"--extinst-glsl-grammar=$(location {0}) " +
"--glsl-insts-output=$(location {1})"
).format(*fmtargs),
tools = [":generate_grammar_tables"],
exec_tools = [":generate_grammar_tables"],
visibility = ["//visibility:private"],
)

Expand Down Expand Up @@ -193,7 +193,7 @@ def generate_vendor_tables(extension, operand_kind_prefix = ""):
"--vendor-insts-output=$(location {1}) " +
"--vendor-operand-kind-prefix={2}"
).format(*fmtargs),
tools = [":generate_grammar_tables"],
exec_tools = [":generate_grammar_tables"],
visibility = ["//visibility:private"],
)

Expand All @@ -216,7 +216,7 @@ def generate_extinst_lang_headers(name, grammar = None):
"--extinst-grammar=$< " +
"--extinst-output-path=$(location {0})"
).format(*fmtargs),
tools = [":generate_language_headers"],
exec_tools = [":generate_language_headers"],
visibility = ["//visibility:private"],
)

Expand Down

0 comments on commit 6803cc5

Please sign in to comment.