Skip to content

Commit

Permalink
Add patch file to remove use of incompatible_use_toolchain_transition
Browse files Browse the repository at this point in the history
from upb.

Part of removing the toolchain transition entirely, bazelbuild#14127.
  • Loading branch information
katre committed Feb 28, 2024
1 parent f26a600 commit 53779d9
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 0 deletions.
1 change: 1 addition & 0 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ filegroup(
"//third_party/py/mock:srcs",
"//third_party/py/six:srcs",
"//third_party/remoteapis:srcs",
"//third_party/upb:srcs",
"//third_party/zlib:srcs",
],
)
Expand Down
20 changes: 20 additions & 0 deletions third_party/upb/00_remove_toolchain_transition.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl
index cb9800ca..08d03edc 100644
--- a/bazel/upb_proto_library.bzl
+++ b/bazel/upb_proto_library.bzl
@@ -316,7 +316,6 @@ _upb_proto_library_aspect = aspect(
attr_aspects = ["deps"],
fragments = ["cpp"],
toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
- incompatible_use_toolchain_transition = True,
)

upb_proto_library = rule(
@@ -369,7 +368,6 @@ _upb_proto_reflection_library_aspect = aspect(
attr_aspects = ["deps"],
fragments = ["cpp"],
toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
- incompatible_use_toolchain_transition = True,
)

upb_proto_reflection_library = rule(
11 changes: 11 additions & 0 deletions third_party/upb/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
licenses(["notice"])

filegroup(
name = "srcs",
srcs = glob(["**"]), # glob everything to satisfy the compile.sh srcs test
visibility = ["//third_party:__pkg__"],
)

exports_files([
"00_remove_toolchain_transition.patch",
])

0 comments on commit 53779d9

Please sign in to comment.