[CMake] Check target, not host, for Info.plist #5160
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 variable `APPLE` is set to true when building on a macOS host, which means that logic to include linker flags for application extensions, etc., will be enabled on a macOS host. That is, they will be enabled even when cross-compiling the standard library to a non-Apple platform, such as Android. Instead of using `APPLE` to check the host OS, check whether the target is an Apple platform.
|
@swift-ci Please test |
jrose-apple
approved these changes
Oct 6, 2016
|
Looks reasonable. |
|
Sorry for the late comment, but I wanted to point out that this is actually a situation where Swift's use of CMake is problematic. In CMake |
|
I only found two |
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 variable
APPLEis set to true when building on a macOS host, which means that logic to include linker flags for application extensions, etc., will be enabled on a macOS host. That is, they will be enabled even when cross-compiling the standard library to a non-Apple platform, such as Android.Instead of using
APPLEto check the host OS, check whether the target is an Apple platform.This was pulled out of the larger pull request #4972, which addresses SR-1362.