Skip to content

Commit 3893064

Browse files
committed
fix: disable Java toolchain which is causing C++ compiles
1 parent 15dcfe6 commit 3893064

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

examples/BUILD.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ py_proto_library(
1515
deps = [":foo_proto"],
1616
)
1717

18-
java_proto_library(
19-
name = "foo_java_proto",
20-
deps = [":foo_proto"],
21-
)
18+
# See comment in examples/tools/toolchains/BUILD.bazel
19+
# java_proto_library(
20+
# name = "foo_java_proto",
21+
# deps = [":foo_proto"],
22+
# )
2223

2324
go_proto_library(
2425
name = "foo_go_proto",

examples/tools/toolchains/BUILD.bazel

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@ proto_lang_toolchain(
1919
)
2020

2121
# Same as above, but for Java
22-
proto_lang_toolchain(
23-
name = "protoc_java_toolchain",
24-
command_line = "--java_out=%s",
25-
progress_message = "Generating Java proto_library %{label}",
26-
runtime = "@protobuf-java//jar",
27-
toolchain_type = "@rules_java//java/proto:toolchain_type",
28-
)
22+
# Broken by https://github.com/protocolbuffers/protobuf/pull/19679
23+
# which causes building C++ code from source.
24+
# TODO: re-enable once protobuf honors the toolchain
25+
# proto_lang_toolchain(
26+
# name = "protoc_java_toolchain",
27+
# command_line = "--java_out=%s",
28+
# progress_message = "Generating Java proto_library %{label}",
29+
# runtime = "@protobuf-java//jar",
30+
# toolchain_type = "@rules_java//java/proto:toolchain_type",
31+
# )
2932

3033
################
3134
# Setup a non-functional C++ toolchain, so we're assured that no C++ compilation

0 commit comments

Comments
 (0)