Allow omitting the target triple for swift sdk configure #8856
+49
−8
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
marcprux
requested review from
jakepetroules,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
Seems good, I think the reviewers will ask for a test though. Running it through self-hosted CI to make sure the patch didn't break anything. |
|
@swift-ci test self hosted |
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.
You can now run
swift sdk configure --sdk-root-path /some/sdk/root sdk-idwithout needing to specify the target tripleMotivation:
The Android SDK (swiftlang/swift#80788 (comment)) needs to have its
sdkRootPathconfigured to point to an external NDK sysroot. But it contains many different target triples, likearmv7-unknown-linux-androideabi33andx86_64-unknown-linux-android29, all of which need to be configured to point to the same sysroot. Following on to #8687 and swiftlang/swift-evolution#2888, this PR enables running a single command to configure the entire SDK, like so:This will result in configurations being created for each of the target triples for the SDK ID.
In addition, this fixes #8584, where
swift sdk configurewith a specified target triple didn't work at all, and instead would configure some random target triple for the specified SDK.Modifications:
Make the
targetTripleflag forConfigureSwiftSDKoptional and, when nil, apply the command to all triples included in the specified SDK.Result:
Fixes #8584 and enables configuring multiple target triples with a single
swift sdk configurecommand.