Skip to content

Commit f2221f8

Browse files
habermancopybara-github
authored andcommitted
Post-Bazel 7 cleanups.
PiperOrigin-RevId: 891019426
1 parent 7ec6572 commit f2221f8

2 files changed

Lines changed: 1 addition & 8 deletions

File tree

bazel/toolchains/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ bzl_library(
2525
deps = [
2626
"//bazel/common:proto_common_bzl",
2727
"//bazel/private:proto_lang_toolchain_rule_bzl",
28-
"@proto_bazel_features//:features",
2928
],
3029
)
3130

bazel/toolchains/proto_lang_toolchain.bzl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#
88
"""proto_lang_toolchain rule"""
99

10-
load("@proto_bazel_features//:features.bzl", "bazel_features")
1110
load("//bazel/common:proto_common.bzl", "proto_common")
1211
load("//bazel/private:proto_lang_toolchain_rule.bzl", _proto_lang_toolchain_rule = "proto_lang_toolchain")
1312

@@ -30,12 +29,7 @@ def proto_lang_toolchain(*, name, toolchain_type = None, exec_compatible_with =
3029
if getattr(proto_common, "INCOMPATIBLE_PASS_TOOLCHAIN_TYPE", False):
3130
attrs["toolchain_type"] = toolchain_type
3231

33-
# This condition causes Starlark rules to be used only on Bazel >=7.0.0
34-
if bazel_features.proto.starlark_proto_info:
35-
_proto_lang_toolchain_rule(name = name, **attrs)
36-
else:
37-
# On older Bazel versions keep using native rules, so that mismatch in ProtoInfo doesn't happen
38-
native.proto_lang_toolchain(name = name, **attrs) # buildifier: disable=native-proto-lang-toolchain
32+
_proto_lang_toolchain_rule(name = name, **attrs)
3933

4034
if toolchain_type:
4135
native.toolchain(

0 commit comments

Comments
 (0)