diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-05-24 00:03:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 00:03:28 -0700 |
| commit | 9f49efef6203973931894a4ed9b862b3e3d639f0 (patch) | |
| tree | 1510f73bf9b6b4b28a229815f846670423846e16 /bazel | |
| parent | 1a77fbce39f5a764e80a7e873da662b74dfc6fb0 (diff) | |
| parent | 6d204851d2d427aca6e471cb40a87fe0409de4c8 (diff) | |
Merge pull request #173 from hlopko/migrate_for_bazel_027
Update upb to be forward compatible with Bazel 0.27
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/upb_proto_library.bzl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl index 0dc8c6e..09d557c 100644 --- a/bazel/upb_proto_library.bzl +++ b/bazel/upb_proto_library.bzl @@ -70,6 +70,7 @@ def _cc_library_func(ctx, name, hdrs, srcs, dep_ccinfos): linking_contexts = [info.linking_context for info in dep_ccinfos] toolchain = find_cpp_toolchain(ctx) feature_configuration = cc_common.configure_features( + ctx = ctx, cc_toolchain = toolchain, requested_features = ctx.features, unsupported_features = ctx.disabled_features, @@ -234,6 +235,7 @@ _upb_proto_library_aspect = aspect( implementation = _upb_proto_aspect_impl, attr_aspects = ["deps"], fragments = ["cpp"], + toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], ) upb_proto_library = rule( @@ -276,6 +278,7 @@ _upb_proto_reflection_library_aspect = aspect( implementation = _upb_proto_aspect_impl, attr_aspects = ["deps"], fragments = ["cpp"], + toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], ) upb_proto_reflection_library = rule( |