bazel
/
rules_cc
mirror of https://github.com/bazelbuild/rules_cc
2
0
Fork 0
Code Issues Releases Activity

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
This commit is contained in:
Googler 2024-10-30 09:21:38 -07:00 committed by Copybara-Service
parent 597be676dd
commit b15fed2409
5 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MODULE.bazel
View File

@ -7,7 +7,6 @@ module(
bazel_dep(name = "bazel_features", version = "1.19.0") bazel_dep(name = "bazel_features", version = "1.19.0")
bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "platforms", version = "0.0.10") bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "protobuf", version = "27.0")
cc_configure = use_extension("//cc:extensions.bzl", "cc_configure_extension") cc_configure = use_extension("//cc:extensions.bzl", "cc_configure_extension")
use_repo(cc_configure, "local_config_cc", "local_config_cc_toolchains") use_repo(cc_configure, "local_config_cc", "local_config_cc_toolchains")

7
WORKSPACE
View File

@ -30,10 +30,3 @@ http_archive(
strip_prefix = "rules_testing-0.6.0", strip_prefix = "rules_testing-0.6.0",
url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.6.0/rules_testing-v0.6.0.tar.gz", url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.6.0/rules_testing-v0.6.0.tar.gz",
) )
http_archive(
name = "protobuf",
sha256 = "da288bf1daa6c04d03a9051781caa52aceb9163586bff9aa6cfb12f69b9395aa",
strip_prefix = "protobuf-27.0",
url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",
)

0
cc/WORKSPACE.bzlmod → WORKSPACE.bzlmod
View File

3
cc/defs.bzl
View File

@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
"""Starlark rules for building C++ projects.""" """Starlark rules for building C++ projects."""
load("@protobuf//bazel:cc_proto_library.bzl", _cc_proto_library = "cc_proto_library")
load("//cc:cc_binary.bzl", _cc_binary = "cc_binary") load("//cc:cc_binary.bzl", _cc_binary = "cc_binary")
load("//cc:cc_import.bzl", _cc_import = "cc_import") load("//cc:cc_import.bzl", _cc_import = "cc_import")
load("//cc:cc_library.bzl", _cc_library = "cc_library") load("//cc:cc_library.bzl", _cc_library = "cc_library")
@ -43,8 +42,6 @@ cc_shared_library = _cc_shared_library
objc_library = _objc_library objc_library = _objc_library
objc_import = _objc_import objc_import = _objc_import
cc_proto_library = _cc_proto_library # For compatibility with current users
# Toolchain rules # Toolchain rules
cc_toolchain = _cc_toolchain cc_toolchain = _cc_toolchain

1
cc/private/toolchain/unix_cc_configure.bzl
View File

@ -611,6 +611,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overridden_tools):
repository_ctx.template( repository_ctx.template(
"BUILD", "BUILD",
paths["@rules_cc//cc/private/toolchain:BUILD.tpl"], paths["@rules_cc//cc/private/toolchain:BUILD.tpl"],
# @unsorted-dict-items
{ {
"%{abi_libc_version}": escape_string(get_env_var( "%{abi_libc_version}": escape_string(get_env_var(
repository_ctx, repository_ctx,