Skip to content

Commit

Permalink
Automated rollback of commit bafc72e.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Breaking change.

*** Original change description ***

Fix cc_shared_library error with hdr-only libraries

cc_libraries with a linker_input with no libraries (either because they
contain only headers or only linkopts) caused errors in cc_shared_libraries
triggered by a check that made sure that a cc_library wasn't linked more than
once into different shared libraries. That check can be ignored in those cases.

Fixes #19920

RELNOTES:none
***
PiperOrigin-RevId: 579182348
Change-Id: I6c6efbf47d1a805c84378e1e993816fcdf9f6635
  • Loading branch information
buildbreaker2021 authored and copybara-github committed Nov 3, 2023
1 parent 6747679 commit 9469d5a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -454,11 +454,6 @@ def _filter_inputs(
_add_linker_input_to_dict(linker_input.owner, transitive_exports[owner])
linker_inputs_count += 1
elif owner in targets_to_be_linked_statically_map:
if not linker_input.libraries:
# TODO(bazel-team): semantics.should_create_empty_archive() should be
# cleaned up and return False in every case. cc_libraries shouldn't
# produce empty archives. For now issue #19920 is only fixed in Bazel.
continue
if owner in link_once_static_libs_map:
# We are building a dictionary that will allow us to give
# proper errors for libraries that have been linked multiple
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ cc_library(
"//conditions:default": [],
}),
deps = select({
":is_bazel": ["qux2", "hdr_only"],
":is_bazel": ["qux2"],
"//conditions:default": [],
}) + [
"bar",
Expand Down Expand Up @@ -298,7 +298,7 @@ cc_library(
deps = [
"barX",
] + select({
":is_bazel": ["qux2", "hdr_only"],
":is_bazel": ["qux2"],
"//conditions:default": [],
}),
)
Expand Down Expand Up @@ -449,17 +449,6 @@ cc_library(
srcs = [":private_cc_library.cc"]
)

genrule(
name = "hdr_only_hdr",
outs = ["hdr_only_hdr.h"],
cmd = "touch $@",
)

cc_library(
name = "hdr_only",
hdrs = [":hdr_only_hdr"],
)

build_failure_test(
name = "two_dynamic_deps_same_export_in_so_test",
message = "Two shared libraries in dependencies export the same symbols",
Expand Down

0 comments on commit 9469d5a

Please sign in to comment.