Skip adding alias targets when they don't exist #36782
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
The CMake uses the concept of a "primary variant" which isn't necessarily aligned with either the host or target. In some cases, like cross-compiling an iOS compiler toolchain for macosx-arm64, the expected "primary variant" target will be missing and so CMake will fail. We can skip adding the alias since build-script will call the more specific target anyway.
|
@swift-ci please smoke test |
edymtt
requested changes
Apr 6, 2021
edymtt
approved these changes
Apr 6, 2021
|
@swift-ci please smoke test |
|
I'm also rebuilding locally against a preset that I'm sure exercises cross-compilation |
|
@swift-ci please smoke test macOS Platform |
1 similar comment
|
@swift-ci please smoke test macOS Platform |
edymtt
reviewed
Apr 7, 2021
edymtt
requested changes
Apr 7, 2021
compnerd
approved these changes
Apr 7, 2021
edymtt
approved these changes
Apr 7, 2021
Adjust the condition and message to skip the primary variant alias in a way that's more clear and more directly matches the explanation in the comments. Co-authored-by: Eric Miotto <[email protected]>
porglezomp
force-pushed
the
feeling-rather-cross-compiling
branch
from
6f4c29c to
2d3d515
Compare
|
Just squashing the two review fixup commits and improving their commit message. |
|
@swift-ci please smoke test and merge |
1 similar comment
|
@swift-ci please smoke test and merge |
|
@swift-ci please smoke test macOS Platform and merge |
|
@swift-ci please smoke test macOS Platform |
1 similar comment
|
@swift-ci please smoke test macOS Platform |
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.
The CMake uses the concept of a "primary variant" which isn't necessarily aligned with either the host or target. In some cases, like cross-compiling an iOS compiler toolchain for
macosx-arm64, the expected "primary variant" target will be missing and so CMake will fail. We can skip adding the alias sincebuild-scriptwill call the more specific target anyway.