Skip to content
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.

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

Fix non-exhaustive chip check #161

Merged
merged 1 commit into from
Sep 20, 2018
Merged

Fix non-exhaustive chip check #161

merged 1 commit into from
Sep 20, 2018

Conversation

frederoni
Copy link
Contributor

@frederoni frederoni commented Sep 19, 2018

Fixes #160 Carthage Installation Fails when building for watchOS.

The cross-compiled fat file consists of i386 armv7k arm64_32, however, the if arch(i386) compilation directive does not catch the i386 architecture when compiling for watchOS simulator despite sysctlbyname("hw.cputype") indicating x86 CPU_TYPE_X86.

This change works around this by checking for os when it should be checking for arch. I've also made the compilation directive exhaustive by adding an unknown chip.

Also, we should get Xcode 10 bots up and running.

@1ec5 @hyerra

@friedbunny friedbunny added the bug label Sep 19, 2018
@frederoni frederoni merged commit dfc6e0c into master Sep 20, 2018
@frederoni frederoni deleted the fred/watch-gen4 branch September 20, 2018 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants