[5.9] fix apple and darwin triples disambiguation
#6722
Merged
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
Cherry-pick of #6478. Fixes a bug where all triples with vendor `apple` are considered to be OS variants of `darwin`. This change special cases `apple-none` to not match `Triple.isDarwin()`, but all other "apple-*" triples will still be considered to be a variant `darwin`. Fixes some fallout of making the above change to check for the newly added `Triple.isApple()` instead of `Triple.isDarwin()` to allow the triple `apple-none` to opt into behaviors like dead stripping, using libtool, etc. As a result of these changes SwiftPM no longer appends a macOS version number to the `armv7em-apple-none-macho` triple (e.g. `armv7em-apple-none-macho10.13`) removing the work around of passing `-target armv7em-apple-none-macho` via cli args or via a `toolset.json`. Additionally SwiftPM no longer passes unexpected `-rpath` args to the linker when building a static binary for `armv7em-apple-none-macho`. # Conflicts: # Tests/BasicsTests/TripleTests.swift
MaxDesiatov
added
bug
swift 5.9
MaxDesiatov
requested review from
abertelrud,
neonichu and
tomerd
as code owners
|
@swift-ci smoke test |
rauhul
approved these changes
Jul 18, 2023
tomerd
approved these changes
Jul 18, 2023
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.
Cherry-pick of #6478.
Fixes a bug where all triples with vendor
appleare considered to be OS variants ofdarwin. This change special casesapple-noneto not matchTriple.isDarwin(), but all other "apple-*" triples will still be considered to be a variantdarwin.Fixes some fallout of making the above change to check for the newly added
Triple.isApple()instead ofTriple.isDarwin()to allow the tripleapple-noneto opt into behaviors like dead stripping, using libtool, etc.As a result of these changes SwiftPM no longer appends a macOS version number to the
armv7em-apple-none-machotriple (e.g.armv7em-apple-none-macho10.13) removing the work around of passing-target armv7em-apple-none-machoas CLI options or via atoolset.json.Additionally SwiftPM no longer passes unexpected
-rpathargs to the linker when building a static binary forarmv7em-apple-none-macho.