Directly substitute $OPENSSL_PATH

This commit is contained in:
Manish Goregaokar 2014-12-05 06:43:18 -08:00
parent b91a267082
commit 31d188e313
1 changed files with 4 additions and 6 deletions

View File

@ -18,13 +18,11 @@ fn main() {
flags.push_str(" -l gdi32 -l wsock32"); flags.push_str(" -l gdi32 -l wsock32");
} }
// Android doesn't have libcrypto/libssl,
// the toplevel Rust program should compile it themselves
if target.find_str("android").is_some() { if target.find_str("android").is_some() {
os::getenv("OPENSSL_PATH").expect("Android does not provide openssl libraries, please \ let path = os::getenv("OPENSSL_PATH").expect("Android does not provide openssl libraries, please \
build them yourselves (instructions in the README) \ build them yourselves (instructions in the README) \
and provide their location through $OPENSSL_PATH."); and provide their location through $OPENSSL_PATH.");
flags.push_str(" -L ${OPENSSL_PATH}"); flags.push_str(format!(" -L {}", path).as_slice());
} }
println!("cargo:rustc-flags={}", flags); println!("cargo:rustc-flags={}", flags);