[Unix] Use the new -sysroot flag for all non-Darwin Unix platforms, not just Android (#1811)
#1819
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
… not just Android (swiftlang#1811) This makes two changes: 1. Use the new flag on all Unix platforms, as in the original frontend pull where it was introduced, swiftlang/swift#72352. 2. When compiling for Android and `ANDROID_NDK_ROOT` is unset, fall back to the `-sdk` as the sysroot when linking.
|
@swift-ci please test |
|
Ping @nkcsgexi, small pull for 6.1 that primarily only affects cross-compiling for Android. |
nkcsgexi
approved these changes
Feb 27, 2025
|
Thanks for the quick review. 😃 |
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.
Explanation: This makes two changes:
-sysrootoption for non-Darwin targets swift#72352.ANDROID_NDK_ROOTis unset, fall back to the-sdkas the sysroot when linking.I'm primarily concerned with 2., as it got a few packages cross-compiling again with both my trunk and 6.1 Android SDK bundles, but I went ahead and updated 1. also, when I looked into how that new
-sysrootflag was introduced in that linked compiler frontend pull.Scope: Only affects Unix platforms and Android
Issue: None
Original PR: #1811
Risk: Very low
Testing: Passed all CI on trunk and appears to fix getting my Android SDK bundle working with this new swift-driver again, because of 2.
Reviewer: @compnerd