Do not use runfiles.collect_data
#3531
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krasimirgg
requested changes
Jul 28, 2025
Collaborator
krasimirgg
left a comment
There was a problem hiding this comment.
also plz look into the formatting error and if possible add some unit tests.
UebelAndre
reviewed
Jul 29, 2025
runfiles.collect_data
This PR makes sure that Rust forwards runfiles from C++ rules exactly like C++ rules do (currently, Rust sends shared libraries to data_runfiles even when linking statically, C++ doesn't).
krasimirgg
approved these changes
Jul 31, 2025
Collaborator
krasimirgg
left a comment
There was a problem hiding this comment.
Looks good! Thank you!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this PR, Rust rules merge data_runfiles of dependencies into its default_runfiles (because we used
[collect_data=True](https://bazel.build/versions/7.1.0/rules/lib/builtins/ctx#runfiles)).cc_librariesput shared libraries to data_runfiles even whencc_libraryhas a static library equivalent and Bazel is linking statically. This becomes problematic when packaging binaries - we end up putting unnecessary shared libraries into the package.Therefore, this PR removes the use of
collect_data, and refactors our runfiles logic to follow the latest guidance. While at it, I made sure to only put transitive shared libraries to runfiles when building a binary-like target (bin, staticlib, cdylib). This way we avoid depset flattenning in libraries.Added a little regression test.