Merge branch 'master' into ad/readme

This commit is contained in:
Artur Dryomov 2020-02-03 09:24:32 +03:00 committed by GitHub
commit 6600161826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -51,8 +51,10 @@ def _separate_static_and_dynamic_link_libraries(
def _create_linker_context(ctx, static_linker_inputs, dynamic_linker_inputs):
linker_inputs = []
linker_inputs.extend(dynamic_linker_inputs)
# Statically linked symbols should take precedence over dynamically linked.
linker_inputs.extend(static_linker_inputs)
linker_inputs.extend(dynamic_linker_inputs)
return cc_common.create_linking_context(
linker_inputs = depset(linker_inputs, order = "topological"),