Remove computeResourceDirPath and rely on the one reported by -print-target-info
#354
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
|
@swift-ci please test |
|
Does this fix something or is it just clean up? |
|
@cltnschlosser it's just cleanup, this shouldn't change any observable behavior |
|
@swift-ci please test |
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.
In theory this is NFC, but I'll run full CI just in case (Edit: looks like it passed). In addition to replacing all uses of the old method with reference to the target info's
runtimeResourcePath, I had to update the -print-target-info job in toolchain computation to ensure it returned the static resource directory when needed. I tried replacing all uses of runtime library paths with the -print-target-info version too but ran into some issues where the macosx paths weren't included for catalyst targets, I'll need to look into that more.