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

Merge pull request #119 from glennw/android-static-linking 

Use static linking on android, which simplifies deployment since loading...
This commit is contained in:
Steven Fackler 2014-12-16 19:08:44 -05:00
parent ada2398b75 4d49abd102
commit 88b753d3fe
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,14 @@ fn main() {
if pkg_config::find_library("openssl").is_err() { if pkg_config::find_library("openssl").is_err() {
let mut flags = " -l crypto -l ssl".to_string();
let target = os::getenv("TARGET").unwrap(); let target = os::getenv("TARGET").unwrap();
let is_android = target.find_str("android").is_some();
let mut flags = if is_android {
" -l crypto:static -l ssl:static"
} else {
" -l crypto -l ssl"
}.to_string();
let win_pos = target.find_str("windows") let win_pos = target.find_str("windows")
.or(target.find_str("win32")) .or(target.find_str("win32"))
@ -23,7 +28,7 @@ fn main() {
flags.push_str(" -l gdi32 -l wsock32"); flags.push_str(" -l gdi32 -l wsock32");
} }
if target.find_str("android").is_some() { if is_android {
let path = 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.");