Commit b8a41f79 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #110 from Manishearth/patch-1 

Directly substitute $OPENSSL_PATH
parents b91a2670 31d188e3

openssl-sys/src/build.rs

+4 −6
Original line number Diff line number Diff line
@@ -18,13 +18,11 @@ fn main() { 
           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() {

            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) \

                                                          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);