Look up runtime libraries in SDK #25740
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
In swiftlang#23175, we started looking in the SDK for swiftmodules, but we want to look for the dylibs there too. Fixes <rdar://problem/52059706>.
|
@swift-ci please smoke test |
Refactor to merge some very similar code in different branches. This ended up slightly changing the order of arguments in Linux linker commands.
Gives us consistent results between macOS and Linux.
|
@swift-ci please test |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
jrose-apple
approved these changes
Jun 25, 2019
|
|
||
| SmallVector<std::string, 4> RuntimeLibPaths; | ||
| getRuntimeLibraryPaths(RuntimeLibPaths, context.Args, | ||
| context.OI.SDKPath, /*Shared=*/!wantsStaticStdlib); |
There was a problem hiding this comment.
Apple platforms don't support the static stdlib anymore, so you can probably just drop this.
There was a problem hiding this comment.
Doing this properly (i.e. with good diagnostics) will require a little more work than I want to do right now. I've filed https://bugs.swift.org/browse/SR-11015 to track the idea.
Turns out the order of the linker flags matters on Linux; see swiftlang#9958. I don’t know if the change I previously made would break something, but it’s not worth risking it.
|
@swift-ci please smoke test |
|
@swift-ci please test Windows platform |
1 similar comment
|
@swift-ci please test Windows platform |
|
@swift-ci please smoke test |
|
@swift-ci please test Windows platform |
beccadax
added a commit
to beccadax/swift
that referenced
this pull request
Jul 3, 2019
Cherry-picks swiftlang#25740: > In swiftlang#23175, we started looking in the SDK for swiftmodules, but we want to look for the dylibs there too. Fixes <rdar://problem/52059706>.
beccadax
added a commit
that referenced
this pull request
Jul 8, 2019
[5.1] Look up runtime libraries in SDK (#25740)
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 #23175, we started looking in the SDK for swiftmodules, but we want to look for the libraries there too while linking. Fixes rdar://problem/52059706.
(This PR is not quite fully baked, but I want to kick off Linux tests while I read over the code and check a few details about how this should behave.)This PR ought to be ready to go, but I could use confirmation that it's actually implementing the desired behavior.