From 373bc0346e33670a702cc79ce14f377cc4523d25 Mon Sep 17 00:00:00 2001 From: Max Gabrielsson Date: Mon, 3 Jun 2024 10:21:30 +0200 Subject: [PATCH] before --- crates/libduckdb-sys/build.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/crates/libduckdb-sys/build.rs b/crates/libduckdb-sys/build.rs index bd25ecdf..5042a7c6 100644 --- a/crates/libduckdb-sys/build.rs +++ b/crates/libduckdb-sys/build.rs @@ -140,6 +140,14 @@ mod build_bundled { cfg.includes(include_dirs.iter().map(|x| format!("{}/{}", lib_name, x))); + #[cfg(feature = "httpfs")] + { + if let Ok((_, openssl_include_dir)) = super::openssl::get_openssl_v2() { + cfg.include(openssl_include_dir); + } + add_extension(&mut cfg, &manifest, "httpfs", &mut cpp_files, &mut include_dirs); + } + for f in cpp_files { cfg.file(f); } @@ -155,15 +163,6 @@ mod build_bundled { if win_target() { cfg.define("DUCKDB_BUILD_LIBRARY", None); } - - #[cfg(feature = "httpfs")] - { - if let Ok((_, openssl_include_dir)) = super::openssl::get_openssl_v2() { - cfg.include(openssl_include_dir); - } - add_extension(&mut cfg, &manifest, "httpfs", &mut cpp_files, &mut include_dirs); - } - cfg.compile(lib_name); println!("cargo:lib_dir={out_dir}"); }