diff options
| author | Steven Fackler <[email protected]> | 2015-02-03 13:03:53 -0500 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-02-03 13:03:53 -0500 |
| commit | 2864db42af6f11aa761028cbc84a22db6c8dd551 (patch) | |
| tree | 0d13adc727c0b043426c3e9932b2c29750935935 /openssl-sys/src | |
| parent | Release v0.3.0 (diff) | |
| parent | Don't bail out when targeting Android (diff) | |
| download | rust-openssl-2864db42af6f11aa761028cbc84a22db6c8dd551.tar.xz rust-openssl-2864db42af6f11aa761028cbc84a22db6c8dd551.zip | |
Merge pull request #153 from mbrubeck/android
Don't bail out of openssl-sys build config when targeting Android
Diffstat (limited to 'openssl-sys/src')
| -rw-r--r-- | openssl-sys/src/build.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openssl-sys/src/build.rs b/openssl-sys/src/build.rs index cb1b41c5..a5d3f2d1 100644 --- a/openssl-sys/src/build.rs +++ b/openssl-sys/src/build.rs @@ -5,15 +5,16 @@ extern crate "pkg-config" as pkg_config; use std::os; fn main() { + let target = os::getenv("TARGET").unwrap(); + let is_android = target.find_str("android").is_some(); + // Without hackory, pkg-config will only look for host libraries. // So, abandon ship if we're cross compiling. - if !pkg_config::target_supported() { return; } - + if !is_android && !pkg_config::target_supported() { + panic!("unsupported target"); + } if pkg_config::find_library("openssl").is_err() { - let target = os::getenv("TARGET").unwrap(); - let is_android = target.find_str("android").is_some(); - let mut flags = if is_android { " -l crypto:static -l ssl:static" } else { |