diff options
| author | Steven Fackler <[email protected]> | 2014-12-10 00:23:10 -0500 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-12-10 00:23:10 -0500 |
| commit | 6d6ef3e747ee25764e5e39406f3eb15cd18b065d (patch) | |
| tree | e3e57edf85c44b354fc16a719bd2edc27b6d6ac6 | |
| parent | Merge pull request #108 from DiamondLovesYou/nacl-crosses (diff) | |
| parent | Now that pkg-config 0.1.1 has been published, delegate to bailout detection t... (diff) | |
| download | rust-openssl-6d6ef3e747ee25764e5e39406f3eb15cd18b065d.tar.xz rust-openssl-6d6ef3e747ee25764e5e39406f3eb15cd18b065d.zip | |
Merge pull request #113 from DiamondLovesYou/nacl-crosses
Now that pkg-config 0.1.1 has been published, delegate bailout detection to pkg-config.
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | openssl-sys/Cargo.toml | 4 | ||||
| -rw-r--r-- | openssl-sys/src/build.rs | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ [package] name = "openssl" -version = "0.2.2" +version = "0.2.3" authors = ["Steven Fackler <[email protected]>"] license = "Apache-2.0" description = "OpenSSL bindings" diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index c434be49..60ebc8c3 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 <[email protected]>", "Steven Fackler <[email protected]>"] 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 e678f2b6..53c047b2 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() { |