[build-script-helper] Add support for Android cross-compilation #424
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
finagolfin
commented
Aug 20, 2021
finagolfin
commented
Aug 20, 2021
|
@swift-ci please test |
benlangmuir
reviewed
Aug 20, 2021
Add new flags '--cross-compile-host' and '--cross-compile-config' and use them to cross-compile, gated only for Android for now. Add a '--prefix' flag to install to a cross-compiled toolchain instead and set 'SWIFT_EXEC' when using SPM, so it uses the right Swift toolchain.
finagolfin
commented
Aug 21, 2021
| install(bin_path, args.toolchain) | ||
|
|
||
| if not args.install_prefixes: | ||
| args.install_prefixes = [args.toolchain] |
There was a problem hiding this comment.
I had tested this default case like this initially, then modified it to just passing args.install_prefixes if not None else [args.toolchain] to the line below and not tested the default case again. For whatever reason, that doesn't work, so going back to this.
|
Ping, just needs another CI run. |
|
@swift-ci please test |
benlangmuir
approved these changes
Aug 25, 2021
|
This can be merged, as it doesn't depend on any other pull. |
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.
Add new flags
--cross-compile-hostand--cross-compile-configand use them to cross-compile, gated only for Android for now. Add a--prefixflag to install to a cross-compiled toolchain instead and setSWIFT_EXECwhen using SPM, so it uses the right Swift toolchain.Along with swiftlang/swift#36917 and an updated version of this
build-scriptpatch to pass the right flags in, I have a working sourcekit-lsp running on Android now, after cross-compiling it from linux for the first time. I will submit that second linked patch once this is in.