Disambiguate apple and darwin triples #6478
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
rauhul
requested review from
abertelrud,
neonichu,
tomerd and
MaxDesiatov
as code owners
|
this needs to be rebased on main once #6438 lands due to the use of |
neonichu
approved these changes
Apr 25, 2023
tomerd
reviewed
Apr 25, 2023
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 darwin variant. 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 spm 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 spm no longer passes unexpected -rpath args to the linker when building a static binary for "armv7em-apple-none-macho".
rauhul
force-pushed
the
apple-not-equal-darwin
branch
from
0cf84e2 to
2e6d5bf
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test windows |
tomerd
approved these changes
Apr 26, 2023
MaxDesiatov
pushed a commit
that referenced
this pull request
Jul 18, 2023
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 a commit
that referenced
this pull request
Jul 19, 2023
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 Co-authored-by: Rauhul Varma <rauhul@users.noreply.github.com>
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.
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 darwin variant.Fixes some fallout of making the above change to check for the newly added
Triple.isApple()instead ofTriple.isDarwin()to allow the triple "apple-none" to opt into behaviors like dead stripping, using libtool, etc.As a result of these changes spm 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 spm no longer passes unexpected -rpath args to the linker when building a static binary for "armv7em-apple-none-macho".