[DepScanner] Do not remove the resource directory path #39945
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
The clang importer sets the clang resource directory to `RuntimeResourcePath`/clang (usually "lib/swift/clang", a symbolic link into "lib/clang/<version>"). This was inadvertently being removed in a check to remove the clang *executable* path. Modify that check to only the first argument so the resource directory is properly passed through.
|
@swift-ci please test |
That's interesting, github completely removes the |
nkcsgexi
approved these changes
Oct 28, 2021
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.
The clang importer sets the clang resource directory to
RuntimeResourcePath/clang (usually "lib/swift/clang", a symbolic linkinto "lib/clang/"). This was inadvertently being removed in a
check to remove the clang executable path.
Modify that check to only the first argument so the resource directory
is properly passed through.