[build-script] Cross-compile sourcekit-lsp for arm64 #59046
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
ahoppen
force-pushed
the
pr/fat-sourcekit-lsp
branch
from
7fdbbf4 to
e88f0fb
Compare
finagolfin
requested changes
May 24, 2022
| @@ -74,6 +74,10 @@ def get_dependencies(cls): | |||
| swiftpm.SwiftPM, | |||
| swiftsyntax.SwiftSyntax] | |||
|
|
|||
| @classmethod | |||
| def has_cross_compile_hosts(self, args): | |||
| return args.cross_compile_hosts | |||
There was a problem hiding this comment.
Maybe pull this into the base class so all products can use it?
| helper_cmd += [cross_compile_host] | ||
| elif product.is_cross_compile_target(host_target): | ||
| helper_cmd += ['--cross-compile-hosts', host_target, | ||
| '--skip-cmake-bootstrap'] |
There was a problem hiding this comment.
Please just copy the above lines here instead, as this is a SPM-specific flag.
ahoppen
force-pushed
the
pr/fat-sourcekit-lsp
branch
2 times, most recently
from
2a323e6 to
7c5be0f
Compare
ahoppen
force-pushed
the
pr/fat-sourcekit-lsp
branch
5 times, most recently
from
37dc138 to
498d4f7
Compare
finagolfin
approved these changes
May 26, 2022
benlangmuir
approved these changes
May 26, 2022
| def supports_cross_compilation(self): | ||
| """ | ||
| Whether the product can be built for a different architecture than the | ||
| host by passing --cross-compile-host to it. |
There was a problem hiding this comment.
Why not just override has_cross_compile_hosts on IndexStoreDB?
There was a problem hiding this comment.
Because I didn’t think of that. Good idea 👍
Currently, when building an open source toolchain, SourceKit-LSP is only built for x86_64. Copy the cross-compilation config from swiftpm.py to also produce a fat sourcekit-lsp executable for both x86_64 and arm64. rdar://78039145
ahoppen
force-pushed
the
pr/fat-sourcekit-lsp
branch
from
498d4f7 to
c1994b4
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please build toolchain |
This was referenced Jun 1, 2022
Merged
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.
Currently, when building an open source toolchain, SourceKit-LSP is only built for x86_64. Copy the cross-compilation config from swiftpm.py to also produce a fat sourcekit-lsp executable for both x86_64 and arm64.
rdar://78039145