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

Merge pull request #531 from aidanhs/aphs-lib-include-dirs 

Allow OPENSSL_{LIB,INCLUDE}_DIR to override OPENSSL_DIR
This commit is contained in:
Steven Fackler 2016-12-12 11:44:51 -08:00 committed by GitHub
parent 152d788998 b090804227
commit b310e594cd
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -102,6 +102,12 @@ The build script can be configured via environment variables:
* `OPENSSL_DIR` - If specified, a directory that will be used to find * `OPENSSL_DIR` - If specified, a directory that will be used to find
OpenSSL installation. It's expected that under this directory the `include` OpenSSL installation. It's expected that under this directory the `include`
folder has header files and a `lib` folder has the runtime libraries. folder has header files and a `lib` folder has the runtime libraries.
* `OPENSSL_LIB_DIR` - If specified, a directory that will be used to find
OpenSSL libraries. Overrides the `lib` folder implied by `OPENSSL_DIR`
(if specified).
* `OPENSSL_INCLUDE_DIR` - If specified, a directory that will be used to find
OpenSSL header files. Overrides the `include` folder implied by `OPENSSL_DIR`
(if specified).
* `OPENSSL_STATIC` - If specified, OpenSSL libraries will be statically rather * `OPENSSL_STATIC` - If specified, OpenSSL libraries will be statically rather
than dynamically linked. than dynamically linked.

14
openssl-sys/build.rs
View File

@ -11,17 +11,25 @@ use std::process::Command;
fn main() { fn main() {
let target = env::var("TARGET").unwrap(); let target = env::var("TARGET").unwrap();
let lib_dir = env::var_os("OPENSSL_LIB_DIR").map(PathBuf::from);
let include_dir = env::var_os("OPENSSL_INCLUDE_DIR").map(PathBuf::from);
let (lib_dir, include_dir) = if lib_dir.is_none() || include_dir.is_none() {
let openssl_dir = env::var_os("OPENSSL_DIR").unwrap_or_else(|| { let openssl_dir = env::var_os("OPENSSL_DIR").unwrap_or_else(|| {
find_openssl_dir(&target) find_openssl_dir(&target)
}); });
let openssl_dir = Path::new(&openssl_dir);
let lib_dir = lib_dir.unwrap_or_else(|| openssl_dir.join("lib"));
let include_dir = include_dir.unwrap_or_else(|| openssl_dir.join("include"));
(lib_dir, include_dir)
} else {
(lib_dir.unwrap(), include_dir.unwrap())
};
let lib_dir = Path::new(&openssl_dir).join("lib");
let include_dir = Path::new(&openssl_dir).join("include");
if !Path::new(&lib_dir).exists() { if !Path::new(&lib_dir).exists() {
panic!("OpenSSL library directory does not exist: {}", panic!("OpenSSL library directory does not exist: {}",
lib_dir.to_string_lossy()); lib_dir.to_string_lossy());
} }
if !Path::new(&include_dir).exists() { if !Path::new(&include_dir).exists() {
panic!("OpenSSL include directory does not exist: {}", panic!("OpenSSL include directory does not exist: {}",
include_dir.to_string_lossy()); include_dir.to_string_lossy());