Skip to content

Commit

Permalink
Migrate to modern linking input API.
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminp committed Oct 26, 2020
1 parent ed95b95 commit 1e01c2f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
11 changes: 8 additions & 3 deletions tools/build_defs/cc_toolchain_util.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def _create_libraries_to_link(ctx, files):
alwayslink = ctx.attr.alwayslink,
))

return libs
return depset(direct = libs)

def _is_position_independent(file):
return file.basename.endswith(".pic.a")
Expand Down Expand Up @@ -214,8 +214,13 @@ def create_linking_info(ctx, user_link_flags, files):
"""

return cc_common.create_linking_context(
user_link_flags = user_link_flags,
libraries_to_link = _create_libraries_to_link(ctx, files),
linker_inputs = depset(direct = [
cc_common.create_linker_input(
owner = ctx.label,
libraries = _create_libraries_to_link(ctx, files),
user_link_flags = depset(direct = user_link_flags),
),
]),
)

def get_env_vars(ctx):
Expand Down
13 changes: 5 additions & 8 deletions tools/build_defs/framework.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -676,12 +676,9 @@ def _extract_libraries(library_to_link):

def _collect_libs(cc_linking):
libs = []
libraries_to_link = cc_linking.libraries_to_link
if type(libraries_to_link) == "depset":
libraries_to_link = libraries_to_link.to_list()

for library_to_link in libraries_to_link:
for library in _extract_libraries(library_to_link):
if library:
libs.append(library)
for li in cc_linking.linker_inputs.to_list():
for library_to_link in li.libraries:
for library in _extract_libraries(library_to_link):
if library:
libs.append(library)
return collections.uniq(libs)

0 comments on commit 1e01c2f

Please sign in to comment.