Fix backward compatibility in host triple checks #6819
Merged
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
MaxDesiatov
requested review from
abertelrud,
neonichu and
tomerd
as code owners
|
@swift-ci smoke test |
kabiroberai
reviewed
Aug 16, 2023
neonichu
reviewed
Aug 16, 2023
MaxDesiatov
commented
Aug 20, 2023
MaxDesiatov
commented
Aug 20, 2023
|
@swift-ci smoke test |
|
@swift-ci test windows |
MaxDesiatov
commented
Aug 24, 2023
| return hostTriple.osVersion >= variantTriple.osVersion | ||
| } else { | ||
| return false | ||
| } |
There was a problem hiding this comment.
I've inlined this check just in SwiftSDKBundle.swift and rewrote it so that it doesn't depend on vendored Triple API and can be easily backported to 5.9.
There was a problem hiding this comment.
Seems fine for 5.9, but we shouldn't land it like this in main IMO
There was a problem hiding this comment.
WDYT of the previous isRuntimeCompatible name for a function to refactor this into?
There was a problem hiding this comment.
This is the naming I'm using after all in the latest commit.
|
@swift-ci smoke test |
|
@swift-ci test windows |
1 similar comment
|
@swift-ci test windows |
It's useful to be able to set host triple in Swift SDKs to `arm64-apple-macosx13.0` to allow cross-compiling from an older version of macOS. This triple is not recognized as directly matching `arm64-apple-macosx14.0` on a newer version of macOS. We should support backward compatibility with Swift SDKs that were built for older version of macOS.
|
@swift-ci test |
MaxDesiatov
force-pushed
the
maxd/fix-host-triple-matching
branch
from
c67a76f
to
2fa29e7
Compare
|
@swift-ci test |
|
This looks reasonable to me, though again I would love to see Triple moved to a distinct target shared between driver and pm |
|
@swift-ci test windows |
MaxDesiatov
commented
Sep 19, 2023
|
@swift-ci test |
MaxDesiatov
added a commit
that referenced
this pull request
Sep 19, 2023
Cherry-pick of #6819. When setting host triple in Swift SDKs to `arm64-apple-macosx13.0` to allow cross-compiling from an older version of macOS, this triple is not recognized as directly matching `arm64-apple-macosx14.0` on a newer version of macOS. We should support backward compatibility with Swift SDKs that were built for older version of macOS. Resolves rdar://113967401. ``` # Conflicts: # Sources/PackageModel/SwiftSDKBundle.swift ```
|
@swift-ci test windows |
1 similar comment
|
@swift-ci test windows |
|
@swift-ci test |
|
@swift-ci test windows |
rauhul
approved these changes
Sep 20, 2023
MaxDesiatov
added a commit
that referenced
this pull request
Sep 28, 2023
Cherry-pick of #6819. When setting host triple in Swift SDKs to `arm64-apple-macosx13.0` to allow cross-compiling from an older version of macOS, this triple is not recognized as directly matching `arm64-apple-macosx14.0` on a newer version of macOS. We should support backward compatibility with Swift SDKs that were built for older version of macOS. Resolves rdar://113967401. ``` # Conflicts: # Sources/PackageModel/SwiftSDKBundle.swift ```
MaxDesiatov
added a commit
that referenced
this pull request
Sep 28, 2023
Cherry-pick of #6819. When setting host triple in Swift SDKs to `arm64-apple-macosx13.0` to allow cross-compiling from an older version of macOS, this triple is not recognized as directly matching `arm64-apple-macosx14.0` on a newer version of macOS. We should support backward compatibility with Swift SDKs that were built for older version of macOS. Resolves rdar://113967401. ``` # Conflicts: # Sources/PackageModel/SwiftSDKBundle.swift ```
MaxDesiatov
added a commit
that referenced
this pull request
Sep 28, 2023
When setting host triple in Swift SDKs to `arm64-apple-macosx13.0` to allow cross-compiling from an older version of macOS, this triple is not recognized as directly matching `arm64-apple-macosx14.0` on a newer version of macOS. We should support backward compatibility with Swift SDKs that were built for older version of macOS. Resolves rdar://113967401.
MaxDesiatov
added a commit
that referenced
this pull request
Sep 28, 2023
When setting host triple in Swift SDKs to `arm64-apple-macosx13.0` to allow cross-compiling from an older version of macOS, this triple is not recognized as directly matching `arm64-apple-macosx14.0` on a newer version of macOS. We should support backward compatibility with Swift SDKs that were built for older version of macOS. Resolves rdar://113967401.
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.
When setting host triple in Swift SDKs to
arm64-apple-macosx13.0to allow cross-compiling from an older version of macOS, this triple is not recognized as directly matchingarm64-apple-macosx14.0on a newer version of macOS.We should support backward compatibility with Swift SDKs that were built for older version of macOS.
Resolves rdar://113967401.