diff options
| author | Steven Fackler <[email protected]> | 2015-06-27 15:11:11 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-06-27 15:11:11 -0700 |
| commit | d0b769c93c623d308c02cb5d86726f4c9607f5f4 (patch) | |
| tree | fd6e13dd16d8596e5d5d8101bfb39d640155ff91 /openssl-sys/build.rs | |
| parent | Merge branch 'release' (diff) | |
| download | rust-openssl-d0b769c93c623d308c02cb5d86726f4c9607f5f4.tar.xz rust-openssl-d0b769c93c623d308c02cb5d86726f4c9607f5f4.zip | |
Move macro replicas into C shim
Diffstat (limited to 'openssl-sys/build.rs')
| -rw-r--r-- | openssl-sys/build.rs | 10 |
1 files changed, 5 insertions, 5 deletions
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<Vec<String>> { |