From 96a3ac26442af7216ddc39ae12777fbd1ed5171c Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Tue, 3 Feb 2015 09:23:15 -0800 Subject: [PATCH] Don't bail out when targeting Android --- openssl-sys/src/build.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openssl-sys/src/build.rs b/openssl-sys/src/build.rs index 3f3053f0..a29bc7cf 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 {