Skip to content

Allow "macos" when parsing triples #300

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
Mar 24, 2022
Merged

Conversation

neonichu
Copy link
Contributor

LLVM target triples support either "macosx" or "macos", so our parsing code should also support both spellings.

@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu neonichu self-assigned this Mar 23, 2022
LLVM target triples support either "macosx" or "macos", so our parsing code should also support both spellings.
@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu
Copy link
Contributor Author

Infra failure

@neonichu
Copy link
Contributor Author

@swift-ci please test macOS

@neonichu neonichu merged commit b7b4c85 into swiftlang:main Mar 24, 2022
@neonichu neonichu deleted the fix-triple branch March 24, 2022 01:19
neonichu added a commit to swiftlang/swift-package-manager that referenced this pull request Mar 29, 2022
In swiftlang/swift-tools-support-core#300, I made `Triple` more lenient w.r.t. different spellings of macOS. Since we are using string matching for finding matching binary artifacts, that would break with differently spelled triples. This PR in conjunction with swiftlang/swift-tools-support-core#307 ensures that we are finding artifacts based on the parsed representation of triples, not their string representations.
neonichu added a commit to swiftlang/swift-package-manager that referenced this pull request Apr 1, 2022
In swiftlang/swift-tools-support-core#300, I made `Triple` more lenient w.r.t. different spellings of macOS. Since we are using string matching for finding matching binary artifacts, that would break with differently spelled triples. This PR in conjunction with swiftlang/swift-tools-support-core#307 ensures that we are finding artifacts based on the parsed representation of triples, not their string representations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants