Skip to content

Commit

Permalink
replace _get_canonical_form(label) with str(label)
Browse files Browse the repository at this point in the history
Fixes a bug where the label returned from _get_canonical_form() was missing a leading @.

Now that `--incompatible_unambiguous_label_stringification=true` is on by default, str(label) already returns the appropriate target label.

RELNOTES: Fixes a bug where some compilation flags would not be applied to a cc_test
PiperOrigin-RevId: 491632546
Change-Id: Ib00d7004636283c9d39d9612d7fe2e5e31429653
  • Loading branch information
Googler authored and Copybara-Service committed Nov 29, 2022
1 parent 0b15a07 commit cd40666
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl
Expand Up @@ -366,12 +366,6 @@ def _get_preloaded_deps_from_dynamic_deps(ctx):

return cc_common.merge_cc_infos(direct_cc_infos = cc_infos, cc_infos = cc_infos).linking_context.linker_inputs.to_list()

def _get_canonical_form(label):
repository = label.workspace_name
if repository == "@":
repository = ""
return repository + "//" + label.package + ":" + label.name

def _filter_libraries_that_are_linked_dynamically(ctx, cc_linking_context, cpp_config):
merged_cc_shared_library_infos = merge_cc_shared_library_infos(ctx)
preloaded_deps = _get_preloaded_deps_from_dynamic_deps(ctx)
Expand Down Expand Up @@ -399,7 +393,7 @@ def _filter_libraries_that_are_linked_dynamically(ctx, cc_linking_context, cpp_c
continue
linker_inputs_seen[stringified_linker_input] = True
owner = str(linker_input.owner)
if owner not in link_dynamically_labels and (owner in link_statically_labels or _get_canonical_form(ctx.label) == owner):
if owner not in link_dynamically_labels and (owner in link_statically_labels or str(ctx.label) == owner):
if owner in link_once_static_libs_map:
linked_statically_but_not_exported.setdefault(link_once_static_libs_map[owner], []).append(owner)
else:
Expand Down

0 comments on commit cd40666

Please sign in to comment.