[CMake] Fix a couple SourceKit CMake issues. #40235
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
…c_Static. The shared arguments should come first, followed by the headers. Otherwise, things don't work correctly, and CMake thinks there are no sources in sourcekitdInProc_Static. This is for <rdar://problem/85511244>.
This setting is set early in SourceKit's CMake logic to match Swift's CMake settings. However, it was then reset back to the empty string. The CMake logic would then see that it was unset and use the host OS as the deployment target. Thankfully, the compiled binaries have been correct without this change, but sourcekitd.framework's Info.plist when building for iOS was incorrect. By removing the reset, the correct value propagates to the right places. This is for <rdar://problem/85511244> and addresses <rdar://problem/68656762>.
|
@swift-ci Please smoke test |
compnerd
approved these changes
Nov 18, 2021
|
Windows failures are related to #40236 |
|
@swift-ci please test Windows platform |
akyrtzi
approved these changes
Dec 3, 2021
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.
[CMake] Correctly order the arguments when setting up sourcekitdInProc_Static.
The shared arguments should come first, followed by the headers.
Otherwise, things don't work correctly, and CMake thinks there are no sources in sourcekitdInProc_Static.
This is for rdar://problem/85511244.
[CMake] Removed an overwrite of the SOURCEKIT_DEPLOYMENT_TARGET setting.
This setting is set early in SourceKit's CMake logic to match Swift's CMake settings.
However, it was then reset back to the empty string. The CMake logic would then see that it was unset and use the host OS as the deployment target.
Thankfully, the compiled binaries have been correct without this change, but sourcekitd.framework's Info.plist when building for iOS was incorrect.
By removing the reset, the correct value propagates to the right places.
This is for rdar://problem/85511244 and addresses rdar://problem/68656762.