From d0b769c93c623d308c02cb5d86726f4c9607f5f4 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 27 Jun 2015 15:11:11 -0700 Subject: Move macro replicas into C shim --- openssl-sys/build.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'openssl-sys/build.rs') diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index de43c462..e788af5d 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -15,7 +15,7 @@ fn main() { if lib_dir.is_none() && include_dir.is_none() { if let Ok(info) = pkg_config::find_library("openssl") { - build_old_openssl_shim(&info.include_paths); + build_openssl_shim(&info.include_paths); return; } if let Some(mingw_paths) = get_mingw_in_path() { @@ -58,18 +58,18 @@ fn main() { include_dirs.push(PathBuf::from(&include_dir)); } - build_old_openssl_shim(&include_dirs); + build_openssl_shim(&include_dirs); } -fn build_old_openssl_shim(include_paths: &[PathBuf]) { +fn build_openssl_shim(include_paths: &[PathBuf]) { let mut config = gcc::Config::new(); for path in include_paths { config.include(path); } - config.file("src/old_openssl_shim.c") - .compile("libold_openssl_shim.a"); + config.file("src/openssl_shim.c") + .compile("libopenssl_shim.a"); } fn get_mingw_in_path() -> Option> { -- cgit v1.2.3 From d465f6c5bb19224205f4ec1da9020cfcbd07d848 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 28 Jun 2015 19:28:28 -0700 Subject: Don't use pkg-config on windows --- openssl-sys/build.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openssl-sys/build.rs') diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index e788af5d..8bbb0657 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -14,9 +14,12 @@ fn main() { let include_dir = env::var("OPENSSL_INCLUDE_DIR").ok(); if lib_dir.is_none() && include_dir.is_none() { - if let Ok(info) = pkg_config::find_library("openssl") { - build_openssl_shim(&info.include_paths); - return; + // rustc doesn't seem to work with pkg-config's output in mingw64 + if !target.contains("windows") { + if let Ok(info) = pkg_config::find_library("openssl") { + build_openssl_shim(&info.include_paths); + return; + } } if let Some(mingw_paths) = get_mingw_in_path() { for path in mingw_paths { -- cgit v1.2.3 From 6e43f5c0d45620cc53df790e6e16cfc274e7deb5 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 28 Jun 2015 19:41:52 -0700 Subject: Modernize cargo directives --- openssl-sys/build.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'openssl-sys/build.rs') diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index 8bbb0657..c1f12034 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -23,7 +23,7 @@ fn main() { } if let Some(mingw_paths) = get_mingw_in_path() { for path in mingw_paths { - println!("cargo:rustc-flags=-L native={}", path); + println!("cargo:rustc-link-search=native={}", path); } } } @@ -49,11 +49,12 @@ fn main() { }; if let Some(lib_dir) = lib_dir { - println!("cargo:rustc-flags=-L native={}", lib_dir); + println!("cargo:rustc-link-search=native={}", lib_dir); } - let libs_arg = libs.iter().fold(String::new(), |args, lib| args + &format!(" -l {0}={1}", mode, lib)); - println!("cargo:rustc-flags={0}", libs_arg); + for lib in libs { + println!("cargo:rustc-link-lib={}={}", mode, lib); + } let mut include_dirs = vec![]; -- cgit v1.2.3