Preserve environment in tripleString(forPlatformVersion:)
#6834
Conversation
This file contains 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
kabiroberai
requested review from
abertelrud,
neonichu,
tomerd and
MaxDesiatov
as code owners
kabiroberai
commented
Aug 21, 2023
| return """ | ||
| \(self.archName)-\ | ||
| \(self.vendorName)-\ | ||
| \(self.osNameUnversioned)\(version) | ||
| \(self.osNameUnversioned)\(version)\ | ||
| \(self.environmentName.isEmpty ? "" : "-\(self.environmentName)") |
There was a problem hiding this comment.
@rauhul could you please confirm whether this is correct? Not sure if I'm missing anything else here.
There was a problem hiding this comment.
I'm currently on vacation and not critically thinking, however until im back (aug 28th) @artemcm may be able to provide some feedback.
MaxDesiatov
changed the title
tripleString(forPlatformVersion:)
artemcm
approved these changes
Aug 21, 2023
|
@swift-ci smoke test |
MaxDesiatov
approved these changes
Aug 21, 2023
|
@swift-ci smoke test windows |
|
@MaxDesiatov this is ready to be 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.
Preserve the
environmentNamepart of triples when altering the OS version withTriple.tripleString(forPlatformVersion:)Motivation:
Building for the iOS simulator (and presumably anything other triple with a fourth component) would fail because we would generate the wrong swiftc/clang
-target, incorrectly excluding theTriple.environmentName.Modifications:
tripleString(forPlatformVersion:)to includeself.environmentNameif it is non-empty.Result:
You can now build for the iOS simulator with
swift build --triple arm64-apple-ios-simulator --sdk "$(xcrun --sdk iphonesimulator --show-sdk-path)"or if you also pull #6828, just