min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113 from DiamondLovesYou/nacl-crosses 

Now that pkg-config 0.1.1 has been published, delegate bailout detection to pkg-config.
This commit is contained in:
Steven Fackler 2014-12-10 00:23:10 -05:00
parent 43c9a43e2d 10e8a8f8e3
commit 6d6ef3e747
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "openssl" name = "openssl"
version = "0.2.2" version = "0.2.3"
authors = ["Steven Fackler <sfackler@gmail.com>"] authors = ["Steven Fackler <sfackler@gmail.com>"]
license = "Apache-2.0" license = "Apache-2.0"
description = "OpenSSL bindings" description = "OpenSSL bindings"

4
openssl-sys/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "openssl-sys" name = "openssl-sys"
version = "0.2.2" version = "0.2.3"
authors = ["Alex Crichton <alex@alexcrichton.com>", authors = ["Alex Crichton <alex@alexcrichton.com>",
"Steven Fackler <sfackler@gmail.com>"] "Steven Fackler <sfackler@gmail.com>"]
license = "MIT" license = "MIT"
@ -17,7 +17,7 @@ sslv2 = []
aes_xts = [] aes_xts = []
[build-dependencies] [build-dependencies]
pkg-config = "0.1" pkg-config = "0.1.1"
[target.le32-unknown-nacl.dependencies] [target.le32-unknown-nacl.dependencies]
libressl-pnacl-sys = "2.1.0" libressl-pnacl-sys = "2.1.0"

2
openssl-sys/src/build.rs
View File

@ -5,7 +5,7 @@ use std::os;
fn main() { fn main() {
// Without hackory, pkg-config will only look for host libraries. // Without hackory, pkg-config will only look for host libraries.
// So, abandon ship if we're cross compiling. // 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() { if pkg_config::find_library("openssl").is_err() {