Skip to content

[5.10] Fix backward compatibility in host triple checks #6925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2023

Conversation

MaxDesiatov
Copy link
Contributor

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

# Conflicts:
#	Sources/PackageModel/SwiftSDKBundle.swift
@MaxDesiatov MaxDesiatov added bug cross-compilation swift 5.10 This PR targets the 5.10 branch labels Sep 19, 2023
@MaxDesiatov MaxDesiatov self-assigned this Sep 19, 2023
@MaxDesiatov MaxDesiatov requested a review from tomerd as a code owner September 19, 2023 13:43
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov merged commit 8f43950 into release/5.10 Sep 19, 2023
@MaxDesiatov MaxDesiatov deleted the maxd/fix-host-triple-matching-5.10 branch September 19, 2023 18:26
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
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cross-compilation swift 5.10 This PR targets the 5.10 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants