Change how libraries are specified to the linker when using searched libs #890
+193
−227
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
Contributor
Author
|
@swift-ci test |
daveinglis
force-pushed
the
building_tests_fixes_windows
branch
8 times, most recently
from
c224e9e to
843e629
Compare
daveinglis
changed the title
daveinglis
force-pushed
the
building_tests_fixes_windows
branch
5 times, most recently
from
e6674c3 to
3d422f3
Compare
Contributor
Author
|
@swift-ci test |
daveinglis
force-pushed
the
building_tests_fixes_windows
branch
from
3d422f3 to
27d13e5
Compare
Contributor
Author
|
@swift-ci test |
…libs - remove the platform specifics from computeLibraryArgs (we cannot assume that all libraries have a lib prefix and what there suffix is.) So we now use the FileType prefix and remove any suffix when using searchPathFlagsForLD, moving this into the LinkerSpec.LibrarySpecifier extension, this allows for proper searching of libraries, and linking of dynamic libraries (especially on Windows).
daveinglis
force-pushed
the
building_tests_fixes_windows
branch
from
27d13e5 to
4fe5921
Compare
Contributor
Author
|
@swift-ci test |
daveinglis
requested review from
aciidgh,
jakepetroules,
mhrawdon,
neonichu and
owenv
as code owners
owenv
reviewed
Nov 12, 2025
| } | ||
|
|
||
| if specifier.useSearchPaths, basename.hasPrefix("lib"), basename.hasSuffix(".a") { | ||
| if specifier.useSearchPaths { |
Collaborator
There was a problem hiding this comment.
Should we emit some kind of warning here if the library name doesn't have one of the prefixes we think will allow it to be found via search paths?
owenv
reviewed
Nov 12, 2025
| fileprivate extension LinkerSpec.LibrarySpecifier { | ||
| func searchPathFlagsForLd(_ name: String) -> [String] { | ||
| func searchPathFlagsForLd() -> [String] { | ||
| let strippedName: String |
Collaborator
There was a problem hiding this comment.
Same question here, should we warn if we get a filename format we don't recognize here / don't think will be found?
owenv
reviewed
Nov 12, 2025
| self.dsymPath = dsymPath | ||
| self.xcframeworkSourcePath = xcframeworkSourcePath | ||
| self.privacyFile = privacyFile | ||
| self.libPrefix = prefixes.first |
Collaborator
There was a problem hiding this comment.
Why do we only consider the first element here?
Collaborator
|
overall this looks great, just have a few questions |
Collaborator
|
we should also run this through cross-repo testing before merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
that all libraries have a lib prefix and what there suffix is.) So we
now use the FileType prefix and remove any suffix when using
searchPathFlagsForLD, moving this into the LinkerSpec.LibrarySpecifier
extension, this allows for proper searching of libraries, and linking
of dynamic libraries (especially on Windows).