Merge pull request #327 from benjaminp/modern-linking

Migrate to modern Starlark linking api.
4 years ago · 994cf07cf3
parent 901744a97e b5bd5807a7
commit 994cf07cf3
1 changed files with 1 additions and 4 deletions
--- a/bazel/upb_proto_library.bzl
+++ b/bazel/upb_proto_library.bzl
@ -183,10 +183,7 @@ def _upb_proto_rule_impl(ctx):
        fail("proto_library rule must generate _UpbWrappedCcInfo or " +
             "_UpbDefsWrappedCcInfo (aspect should have handled this).")

-    if type(cc_info.linking_context.libraries_to_link) == "list":
-        lib = cc_info.linking_context.libraries_to_link[0]
-    else:
-        lib = cc_info.linking_context.libraries_to_link.to_list()[0]
+    lib = cc_info.linking_context.linker_inputs.to_list()[0].libraries[0]
    files = _filter_none([
        lib.static_library,
        lib.pic_static_library,