Skip to content

[cmake] Use is_darwin_sdk over CMAKE_SYSTEM_NAME #5100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Oct 6, 2016
Merged

[cmake] Use is_darwin_sdk over CMAKE_SYSTEM_NAME #5100

merged 1 commit into from
Oct 6, 2016

Conversation

modocache
Copy link
Contributor

Checking CMAKE_SYSTEM_NAME to append Darwin-specific flags happens to work when cross-compiling from one Darwinian system to another -- like using a macOS host to build the standard library for iOS. It doesn't work, however, when cross-compiling from macOS to Android, for example.

Instead of checking the host system name, check whether the SDK target is Darwinian.

This pull request was split out of #4972, which addresses SR-1362.

@modocache modocache mentioned this pull request Oct 3, 2016
Merged
@modocache
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Oct 4, 2016

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - b8edc520cd7a3aab8f45d623e9f83d848185010d
Test requested by - @modocache

@modocache
Copy link
Contributor Author

The macOS failure looks legitimate -- reflection tests are failing because of a change in -rpath, I imagine. Looking into it now.

@modocache
[cmake] Use is_darwin_sdk over CMAKE_SYSTEM_NAME
47bd025 
Checking CMAKE_SYSTEM_NAME to append Darwin-specific flags happens to
work when cross-compiling from one Darwinian system to another -- like
using a macOS host to build the standard library for iOS. It doesn't
work, however, when cross-compiling from macOS to Android, for example.

Instead of checking the host system name, check whether the SDK target
is Darwinian.
@modocache
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Oct 5, 2016

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 47bd025
Test requested by - @modocache

@modocache
Copy link
Contributor Author

No idea about this one. Did a full build and didn't reproduce locally.

@modocache
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Oct 5, 2016

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 47bd025
Test requested by - @modocache

@swift-ci
Copy link
Contributor

swift-ci commented Oct 5, 2016

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 47bd025
Test requested by - @modocache

@modocache
Copy link
Contributor Author

@swift-ci Please clean test OS X platform

@modocache
Copy link
Contributor Author

Oh right, CI outage. My bad! :)

@modocache
Copy link
Contributor Author

@swift-ci Please test Linux platform

@modocache
Copy link
Contributor Author

Yay! CI is all green. @gottesmm, @jrose-apple, does this look good to go?

@jrose-apple
Copy link
Contributor

LGTM.

@modocache modocache merged commit cda377c into swiftlang:master Oct 6, 2016
@modocache modocache deleted the cmake-is-darwin branch October 6, 2016 20:36
@modocache
Copy link
Contributor Author

Awesome, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gottesmm gottesmm

@jrose-apple jrose-apple

@llvm-beanz llvm-beanz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@modocache @swift-ci @jrose-apple @gottesmm @llvm-beanz