From 830658ec0bdae8ba1f6310f2e8116750d01c1b82 Mon Sep 17 00:00:00 2001 From: Noah <33094578+coolreader18@users.noreply.github.com> Date: Sat, 4 Apr 2020 21:09:18 -0500 Subject: [PATCH] Add OPENSSL_NO_VENDOR env var check --- openssl-sys/build/main.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs index 162e11a6..9c4e6f40 100644 --- a/openssl-sys/build/main.rs +++ b/openssl-sys/build/main.rs @@ -13,9 +13,9 @@ use std::path::{Path, PathBuf}; mod cfgs; -#[cfg_attr(feature = "vendored", path = "find_vendored.rs")] -#[cfg_attr(not(feature = "vendored"), path = "find_normal.rs")] -mod find; +mod find_normal; +#[cfg(feature = "vendored")] +mod find_vendored; enum Version { Openssl11x, @@ -41,12 +41,24 @@ fn env(name: &str) -> Option { env_inner(&prefixed).or_else(|| env_inner(name)) } +fn find_openssl(target: &str) -> (PathBuf, PathBuf) { + #[cfg(feature = "vendored")] + { + // vendor if the feature is present, unless + // OPENSSL_NO_VENDOR exists and isn't `0` + if env("OPENSSL_NO_VENDOR").map_or(true, |s| s == "0") { + return find_vendored::get_openssl(target); + } + } + find_normal::get_openssl(target) +} + fn main() { check_rustc_versions(); let target = env::var("TARGET").unwrap(); - let (lib_dir, include_dir) = find::get_openssl(&target); + let (lib_dir, include_dir) = find_openssl(&target); if !Path::new(&lib_dir).exists() { panic!(