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

Use new path API in buildscript

This commit is contained in:
Steven Fackler 2015-02-22 11:14:20 -08:00
parent 69e371aafd
commit ebd9062933
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssl-sys/Cargo.toml
View File

@ -18,8 +18,8 @@ sslv2 = []
aes_xts = [] aes_xts = []
[build-dependencies] [build-dependencies]
pkg-config = "0.2.1" pkg-config = "0.3"
gcc = "0.2" gcc = "0.3"
[target.le32-unknown-nacl.dependencies] [target.le32-unknown-nacl.dependencies]
libressl-pnacl-sys = "2.1.0" libressl-pnacl-sys = "2.1.0"

11
openssl-sys/build.rs
View File

@ -1,9 +1,10 @@
#![feature(env, old_path)] #![feature(env, path)]
extern crate "pkg-config" as pkg_config; extern crate "pkg-config" as pkg_config;
extern crate gcc; extern crate gcc;
use std::env; use std::env;
use std::path::PathBuf;
fn main() { fn main() {
let lib_dir = env::var("OPENSSL_LIB_DIR").ok(); let lib_dir = env::var("OPENSSL_LIB_DIR").ok();
@ -11,7 +12,7 @@ fn main() {
if lib_dir.is_none() && include_dir.is_none() { if lib_dir.is_none() && include_dir.is_none() {
if let Ok(info) = pkg_config::find_library("openssl") { if let Ok(info) = pkg_config::find_library("openssl") {
build_old_openssl_shim(info.include_paths); build_old_openssl_shim(&info.include_paths);
return; return;
} }
} }
@ -37,13 +38,13 @@ fn main() {
let mut include_dirs = vec![]; let mut include_dirs = vec![];
if let Some(include_dir) = include_dir { if let Some(include_dir) = include_dir {
include_dirs.push(Path::new(include_dir)); include_dirs.push(PathBuf::new(&include_dir));
} }
build_old_openssl_shim(include_dirs); build_old_openssl_shim(&include_dirs);
} }
fn build_old_openssl_shim(include_paths: Vec<Path>) { fn build_old_openssl_shim(include_paths: &[PathBuf]) {
let mut config = gcc::Config::new(); let mut config = gcc::Config::new();
for path in include_paths { for path in include_paths {