[5.1][Interpreter] Fall back to loading Swift dylibs from /usr/lib/swift on Apple platforms. #24839
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 |
|
Build failed |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
|
CI issue has been fixed. |
|
Build failed |
|
@swift-ci please test os x platform |
mikeash
force-pushed
the
usrlibswift-fallback-5.1
branch
from
cd28672 to
8e1905d
Compare
|
@swift-ci please test |
…is not set." This reverts commit 92fa5ef.
…eCheck." This reverts commit 199e5a7.
…b/swift first for Swift libraries." This reverts commit 81afe14.
…ing of the DYLD_LIBRARY_PATH value in constructInvocation." This reverts commit acf2c9f.
…ing Swift dylibs from /usr/lib/swift." This reverts commit 14c722b.
…n Apple platforms. Continue to load the dylibs next to the compiler if they exist. If they don't, then use the OS's dylibs. rdar://problem/47528005
mikeash
force-pushed
the
usrlibswift-fallback-5.1
branch
from
8e1905d to
bbdafde
Compare
|
@swift-ci please test |
- Check the target triple at runtime to decide whether to use the fallback. - Change isInResourceDir to actually check the resource dir. - Use ArrayRef<std::string> instead of std::vector<std::string>.
|
@swift-ci please test |
|
Build failed |
|
Build failed |
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.
Cherry-pick #24838 to 5.1. This also reverts #23983, which was a temporary change superseded this one.
Requires LLDB PR apple/swift-lldb#1597.
Continue to load the dylibs next to the compiler if they exist. If they don't, then use the OS's dylibs.
rdar://problem/47528005