[cmake] Only add lipo targets for Darwin #5101
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
jrose-apple
reviewed
Oct 3, 2016
| @@ -357,12 +357,15 @@ endfunction() | |||
| # | |||
| # Usage: | |||
| # _add_swift_lipo_target( | |||
| # sdk # The name of the SDK the target was created for. | |||
| # # Examples include "OSX", "IOS", "ANDROID", etc. | |||
| # target # The name of the target to create | |||
| # output # The file to be created by this target | |||
| # source_targets... # The source targets whose outputs will be | |||
| # # lipo'd into the output. | |||
| # ) | |||
| function(_add_swift_lipo_target target output) | |||
There was a problem hiding this comment.
You didn't actually update the function signature…
There was a problem hiding this comment.
Oomph, my bad. 😓
Thanks for catching that one! I updated the pull request.
Swift's CMake build system creates "fat" binaries for Swift libraries, so long as the host machine used to compile the libraries is a macOS machine. However, when a non-Darwin target, such as Android, is being compiled on a macOS host, this doesn't work. Instead, only add lipo targets if the *target* is Darwin.
modocache
force-pushed
the
cmake-add-lipo-target-sdk
branch
from
b65cb44 to
60edee9
Compare
|
@swift-ci please test |
|
LGTM. |
|
Thanks @jrose-apple! Sorry for the increased pull request review load. :) |
|
I can't speak for the other two but I think I'm net happy to have another pair of hands! |
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.
Swift's CMake build system creates "fat" binaries for Swift libraries, so long as the host machine used to compile the libraries is a macOS machine. However, when a non-Darwin target, such as Android, is being compiled on a macOS host, this doesn't work. Instead, only add lipo targets if the target is Darwin.
This was pulled out of the larger pull request #4972, which addresses SR-1362.