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.

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

Fix build on macOS with latest cc crate #67

Merged
merged 1 commit into from
Jul 8, 2020
Merged

Fix build on macOS with latest cc crate #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,18 @@ impl Build {
continue;
}

// cargo-lipo specifies this but OpenSSL complains
if target.contains("apple-ios") {
// cc includes an `-arch` flag for Apple platforms, but we've
// already selected an arch implicitly via the target above, and
// OpenSSL contains about the conflict if both are specified.
if target.contains("apple") {
if arg == "-arch" {
skip_next = true;
continue;
}
}

// cargo-lipo specifies this but OpenSSL complains
if target.contains("apple-ios") {
if arg == "-isysroot" {
is_isysroot = true;
continue;
Expand Down