Skip to content

Propagate runfiles from deps in cc_shared_library #26014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Propagate runfiles from deps in cc_shared_library #26014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,8 @@ def _cc_shared_library_impl(ctx):
)
for dep in ctx.attr.dynamic_deps:
runfiles = runfiles.merge(dep[DefaultInfo].data_runfiles)
for dep in ctx.attr.deps:
runfiles = runfiles.merge(dep[DefaultInfo].data_runfiles)

precompiled_only_dynamic_libraries_runfiles = []
for precompiled_dynamic_library in precompiled_only_dynamic_libraries:
Expand Down
25 changes: 13 additions & 12 deletions src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/BUILD.builtin_test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("@rules_cc//cc:cc_import.bzl", "cc_import")
load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_python//python:py_test.bzl", "py_test")
load("@rules_shell//shell:sh_test.bzl", "sh_test")
load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
load(
":starlark_tests.bzl",
Expand All @@ -15,10 +19,6 @@ load(
"runfiles_test",
"wrapped_cc_lib",
)
load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("@rules_cc//cc:cc_import.bzl", "cc_import")
load("@rules_shell//shell:sh_test.bzl", "sh_test")

LINKABLE_MORE_THAN_ONCE = "LINKABLE_MORE_THAN_ONCE"

Expand Down Expand Up @@ -180,7 +180,7 @@ cc_library(
# Not exported.
"qux",
"prebuilt",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3:diff_pkg"
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3:diff_pkg",
],
)

Expand Down Expand Up @@ -247,6 +247,7 @@ cc_library(
name = "baz",
srcs = ["baz.cc"],
hdrs = ["baz.h"],
data = ["some_file.txt"],
deps = ["bar3"],
)

Expand Down Expand Up @@ -552,13 +553,13 @@ exports_test(
name = "exports_foo_test",
target = ":foo_so",
targets_that_should_be_claimed_to_be_exported = [
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:indirect_dep2",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:baz",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:foo",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:cc_lib_with_no_srcs",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:nocode_cc_lib",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:should_not_be_linked_cc_lib",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:a_suffix",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:indirect_dep2",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:baz",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:foo",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:cc_lib_with_no_srcs",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:nocode_cc_lib",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:should_not_be_linked_cc_lib",
"//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:a_suffix",
],
)

Expand Down
Empty file added src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/some_file.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/starlark_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ def _runfiles_test_impl(env, target):
# Match e.g. bazel-out/k8-fastbuild/bin/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/libdirect_so_file.so
path_suffix = "/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test"
env.expect.that_collection(runfiles).contains_exactly_predicates([
matching.str_endswith(path_suffix + "/some_file.txt"),
matching.str_endswith(path_suffix + "/libfoo_so.so"),
matching.str_endswith(path_suffix + "/libbar_so.so"),
matching.str_endswith(path_suffix + "/libprivate_lib_so.so"),
Expand Down
Loading