Skip to content

allow out_data_dirs to be referenced through output groups #1451

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

Open
chouquette wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −1
Open

allow out_data_dirs to be referenced through output groups #1451

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
5 changes: 4 additions & 1 deletion foreign_cc/private/framework.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,8 @@ def cc_external_rule_impl(ctx, attrs):
outputs.out_binary_files +
outputs.libraries.static_libraries +
outputs.libraries.shared_libraries +
[outputs.out_include_dir] if outputs.out_include_dir else []
([outputs.out_include_dir] if outputs.out_include_dir else []) +
(outputs.data_dirs if outputs.data_dirs else [])
)
output_groups = _declare_output_groups(installdir_copy.file, output_groups)
wrapped_files = [
Expand Down Expand Up @@ -842,6 +843,7 @@ _Outputs = provider(
out_include_dir = "Directory with header files (relative to install directory)",
out_binary_files = "Binary files, which will be created by the action",
libraries = "Library files, which will be created by the action",
data_dirs = "Directory containing additional files generated by the build",
declared_outputs = "All output files and directories of the action",
),
)
Expand Down Expand Up @@ -898,6 +900,7 @@ def _define_outputs(ctx, attrs, lib_name):
out_include_dir = out_include_dir,
out_binary_files = out_binary_files,
libraries = libraries,
data_dirs = out_data_dirs,
declared_outputs = declared_outputs,
)

Expand Down