Keep other feature configuration from openssl

duckdb · Jun 6, 2024 · 9b72301 · 9b72301
1 parent f5da417
commit 9b72301
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/crates/libduckdb-sys/openssl/find_normal.rs b/crates/libduckdb-sys/openssl/find_normal.rs
@@ -141,7 +141,7 @@ openssl-sys = {}
 openssl-sys crate build failed: no supported version of OpenSSL found.
 
 Ways to fix it:
-- Use the `vendored` feature of openssl-sys crate to build OpenSSL from source.
+- Use the `openssl_vendored` feature of libduckdb-sys crate to build OpenSSL from source.
 - Use Homebrew to install the `openssl` package.
 
 ",

diff --git a/crates/libduckdb-sys/openssl/find_vendored.rs b/crates/libduckdb-sys/openssl/find_vendored.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 pub fn get_openssl(_target: &str) -> (Vec<PathBuf>, PathBuf) {
     let artifacts = openssl_src::Build::new().build();
-    println!("cargo:vendored=1");
+    println!("cargo:openssl_vendored=1");
     println!("cargo:root={}", artifacts.lib_dir().parent().unwrap().display());
 
     (

diff --git a/crates/libduckdb-sys/openssl/mod.rs b/crates/libduckdb-sys/openssl/mod.rs
@@ -22,7 +22,7 @@ extern crate autocfg;
 #[cfg(feature = "openssl_bindgen")]
 extern crate bindgen;
 extern crate cc;
-#[cfg(feature = "vendored")]
+#[cfg(feature = "openssl_vendored")]
 extern crate openssl_src;
 extern crate pkg_config;
 #[cfg(target_env = "msvc")]
@@ -37,7 +37,7 @@ use std::{
 mod cfgs;
 
 mod find_normal;
-#[cfg(feature = "vendored")]
+#[cfg(feature = "openssl_vendored")]
 mod find_vendored;
 #[cfg(feature = "openssl_bindgen")]
 mod run_bindgen;
@@ -69,7 +69,7 @@ fn env(name: &str) -> Option<OsString> {
 }
 
 fn find_openssl(target: &str) -> Result<(Vec<PathBuf>, PathBuf), ()> {
-    #[cfg(feature = "vendored")]
+    #[cfg(feature = "openssl_vendored")]
     {
         // vendor if the feature is present, unless
         // OPENSSL_NO_VENDOR exists and isn't `0`