Android: switch the archiver for static libraries over to llvm-ar #897
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
artemcm
approved these changes
Nov 9, 2021
|
@swift-ci please test |
|
Upstream pull was just merged, this can go in now. |
|
@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.
I just added this to a larger pull, swiftlang/swift#39921, that updates the compiler repo to use Android NDK 23, which got rid of binutils, so updating the archiver here too. Not too important when cross-compiling, as you can still use the system
arjust fine, but when natively compiling in the Termux app on Android,llvm-aris now the default archiver there.I also had to patch llbuild to get SPM to use
llvm-ar, otherwise it just uses the firstarit finds in the systemPATH. @neonichu, this means SPM doesn't use the--toolchainor-Xswiftc -tools-directorypaths passed in for static library products that call the archiver, seemingly breaking that contract. Obviously not too important, as any archiver will do, but when the name changes like it does natively on Android, I had to patch llbuild too.