Revert "Remove cc_proto_library from defs.bzl"

This reverts commit b15fed2409.
This commit is contained in:
Ivo List 2024-11-07 13:26:07 +01:00
parent da65f24105
commit 0c245a456a
5 changed files with 11 additions and 1 deletions

View File

@ -7,6 +7,7 @@ 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")

View File

@ -43,3 +43,10 @@ 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",
)

View File

@ -13,6 +13,7 @@
# 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")
@ -42,6 +43,8 @@ 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

View File

@ -611,7 +611,6 @@ 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,