From bc9002ec75b80c7bc170c2339d0486c002789d69 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 31 Jul 2023 08:04:21 -0700 Subject: [PATCH] bazel: Get rid of exec_tools. (#13401) Bazel has removed this attribute in bazelbuild/bazel@c061e57a7004a88eeb2f84d094d9a88b56c146b6. Closes #13401 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/13401 from benjaminp:exec_tools 9e718ff0fd11ff1fe70ed3e2536373792504c9c5 PiperOrigin-RevId: 552482730 --- build_defs/internal_shell.bzl | 4 ++-- objectivec/BUILD.bazel | 2 +- src/google/protobuf/BUILD.bazel | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_defs/internal_shell.bzl b/build_defs/internal_shell.bzl index 649184a5184c0..91628a5e57f50 100644 --- a/build_defs/internal_shell.bzl +++ b/build_defs/internal_shell.bzl @@ -32,7 +32,7 @@ def inline_sh_binary( native.genrule( name = name + "_genrule", srcs = srcs, - exec_tools = tools, + tools = tools, outs = [name + ".sh"], cmd = "cat <<'EOF' >$(OUTS)\n#!/bin/bash -exu\n%s\nEOF\n" % cmd, visibility = ["//visibility:private"], @@ -77,7 +77,7 @@ def inline_sh_test( native.genrule( name = name + "_genrule", srcs = srcs, - exec_tools = tools, + tools = tools, outs = [name + ".sh"], cmd = "cat <<'EOF' >$(OUTS)\n#!/bin/bash -exu\n%s\nEOF\n" % cmd, visibility = ["//visibility:private"], diff --git a/objectivec/BUILD.bazel b/objectivec/BUILD.bazel index 10798380698c3..c59bf0e60c7b0 100644 --- a/objectivec/BUILD.bazel +++ b/objectivec/BUILD.bazel @@ -42,7 +42,7 @@ genrule( for wkt in _OBJC_WKT_NAMES for ext in _OBJC_EXTS ]), - exec_tools = ["//:protoc"], + tools = ["//:protoc"], tags = ["manual"], ) diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel index 6b4f77d5fa2e0..9956816aab960 100644 --- a/src/google/protobuf/BUILD.bazel +++ b/src/google/protobuf/BUILD.bazel @@ -139,7 +139,7 @@ genrule( --proto_path=$$(dirname $$(dirname $$(dirname $(location any.proto)))) \ $(SRCS) """, - exec_tools = ["//:protoc"], + tools = ["//:protoc"], visibility = ["//visibility:private"], )