Handle frameworks better #346
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
brentleyjones
commented
Apr 25, 2022
Comment on lines
-115
to
+119
| ["-filelist", "\(linkFileList),$(BUILD_DIR)".quoted] | ||
| ["-filelist", linkFileList.quoted] |
There was a problem hiding this comment.
This change was to setup support for cc_import and objc_import. Both of those will have PROJECT_DIR relative paths.
Comment on lines
+94
to
+96
| elif ctx.rule.kind == "objc_import": | ||
| xcode_targets = {} | ||
| excluded = ("archives") |
There was a problem hiding this comment.
All changes in here are temporary, until this is rewritten to default to under-collecting instead of over-collecting.
Comment on lines
+115
to
+116
| def _get_static_libraries(linker_inputs): | ||
| """Returns the static libraries needed to link the target. |
There was a problem hiding this comment.
I want to remove this in the future. It's duplicative of work done in _to_dto, and it's only used by the required_merges calculations.
cgrindel
approved these changes
Apr 25, 2022
This updates `linker_input_files` to be a proper DTO, moves link avoidance into it, removes the manual collection of dynamic frameworks in favor of using `ObjcProvider`, manually removes collection of frameworks into `extra_files` until that is rewritten, and sets up support for `objc_import`.
brentleyjones
force-pushed
the
bj/better-framework-handling
branch
from
ad3739e to
cf8a11f
Compare
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.
Part of #73.
This updates
linker_input_filesto be a proper DTO, moves link avoidance into it, removes the manual collection of dynamic frameworks in favor of usingObjcProvider, manually removes collection of frameworks intoextra_filesuntil that is rewritten, and sets up support forobjc_import.