From 10e8a8f8e3b45c7a89f89b16c74aa3fa5477fa22 Mon Sep 17 00:00:00 2001 From: Richard Diamond Date: Tue, 9 Dec 2014 23:00:05 -0600 Subject: [PATCH] Now that pkg-config 0.1.1 has been published, delegate to bailout detection to pkg-config. Also bump version minors for publishing. :) --- Cargo.toml | 2 +- openssl-sys/Cargo.toml | 4 ++-- openssl-sys/src/build.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 111cb7cb0..f4205d7c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openssl" -version = "0.2.2" +version = "0.2.3" authors = ["Steven Fackler "] license = "Apache-2.0" description = "OpenSSL bindings" diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index c434be499..60ebc8c35 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openssl-sys" -version = "0.2.2" +version = "0.2.3" authors = ["Alex Crichton ", "Steven Fackler "] license = "MIT" @@ -17,7 +17,7 @@ sslv2 = [] aes_xts = [] [build-dependencies] -pkg-config = "0.1" +pkg-config = "0.1.1" [target.le32-unknown-nacl.dependencies] libressl-pnacl-sys = "2.1.0" diff --git a/openssl-sys/src/build.rs b/openssl-sys/src/build.rs index 0ee0dd2c1..ab42b1596 100644 --- a/openssl-sys/src/build.rs +++ b/openssl-sys/src/build.rs @@ -5,7 +5,7 @@ use std::os; fn main() { // Without hackory, pkg-config will only look for host libraries. // So, abandon ship if we're cross compiling. - if os::getenv("HOST") != os::getenv("TARGET") { return; } + if !pkg_config::target_supported() { return; } if pkg_config::find_library("openssl").is_err() { -- GitLab