Skip to content

Commit b15fed2

Browse files
comiuscopybara-github
authored andcommitted
Remove cc_proto_library from defs.bzl
This makes it possible to remove dependency on protobuf. The dependency causes more problems than compatibility with some users of cc_proto_library from rules_cc. Move WORKSPACE.bzlmod into correct directory. PiperOrigin-RevId: 691445019 Change-Id: I45d7b4e381483de14ea2d20110be40f471a1ad12
1 parent 597be67 commit b15fed2

File tree

5 files changed

+1
-11
lines changed

5 files changed

+1
-11
lines changed

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module(
77
bazel_dep(name = "bazel_features", version = "1.19.0")
88
bazel_dep(name = "bazel_skylib", version = "1.7.1")
99
bazel_dep(name = "platforms", version = "0.0.10")
10-
bazel_dep(name = "protobuf", version = "27.0")
1110

1211
cc_configure = use_extension("//cc:extensions.bzl", "cc_configure_extension")
1312
use_repo(cc_configure, "local_config_cc", "local_config_cc_toolchains")

WORKSPACE

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,3 @@ http_archive(
3030
strip_prefix = "rules_testing-0.6.0",
3131
url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.6.0/rules_testing-v0.6.0.tar.gz",
3232
)
33-
34-
http_archive(
35-
name = "protobuf",
36-
sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa",
37-
strip_prefix = "protobuf-27.0",
38-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",
39-
)
File renamed without changes.

cc/defs.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414
"""Starlark rules for building C++ projects."""
1515

16-
load("@protobuf//bazel:cc_proto_library.bzl", _cc_proto_library = "cc_proto_library")
1716
load("//cc:cc_binary.bzl", _cc_binary = "cc_binary")
1817
load("//cc:cc_import.bzl", _cc_import = "cc_import")
1918
load("//cc:cc_library.bzl", _cc_library = "cc_library")
@@ -43,8 +42,6 @@ cc_shared_library = _cc_shared_library
4342
objc_library = _objc_library
4443
objc_import = _objc_import
4544

46-
cc_proto_library = _cc_proto_library # For compatibility with current users
47-
4845
# Toolchain rules
4946

5047
cc_toolchain = _cc_toolchain

cc/private/toolchain/unix_cc_configure.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overridden_tools):
611611
repository_ctx.template(
612612
"BUILD",
613613
paths["@rules_cc//cc/private/toolchain:BUILD.tpl"],
614+
# @unsorted-dict-items
614615
{
615616
"%{abi_libc_version}": escape_string(get_env_var(
616617
repository_ctx,

0 commit comments

Comments
 (0)