From 8785bd903a97942806980fbed5c5d5cde0f25524 Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Thu, 22 Dec 2022 21:05:48 +0800 Subject: [PATCH 1/2] Update build.rs --- libsqlite3-sys/build.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs index 6f089ea..08f04b9 100644 --- a/libsqlite3-sys/build.rs +++ b/libsqlite3-sys/build.rs @@ -185,8 +185,7 @@ mod build_bundled { // Windows without `-vendored-openssl` takes this to link against a prebuilt // OpenSSL lib cfg.include(inc_dir.to_string_lossy().as_ref()); - let lib = lib_dir.join("libcrypto.lib"); - cfg.flag(lib.to_string_lossy().as_ref()); + println!("cargo:rustc-link-lib=dylib=libcrypto"); } else if use_openssl { cfg.include(inc_dir.to_string_lossy().as_ref()); // branch not taken on Windows, just `crypto` is fine. From 279be83bcf64f4eca1124fd07b0bd2ded5e8ab3f Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Fri, 23 Dec 2022 09:31:58 +0800 Subject: [PATCH 2/2] Update build.rs --- libsqlite3-sys/build.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs index 08f04b9..6c8157c 100644 --- a/libsqlite3-sys/build.rs +++ b/libsqlite3-sys/build.rs @@ -181,15 +181,10 @@ mod build_bundled { cfg.include(env::var("DEP_OPENSSL_INCLUDE").unwrap()); // cargo will resolve downstream to the static lib in // openssl-sys - } else if is_windows { - // Windows without `-vendored-openssl` takes this to link against a prebuilt - // OpenSSL lib - cfg.include(inc_dir.to_string_lossy().as_ref()); - println!("cargo:rustc-link-lib=dylib=libcrypto"); } else if use_openssl { cfg.include(inc_dir.to_string_lossy().as_ref()); - // branch not taken on Windows, just `crypto` is fine. - println!("cargo:rustc-link-lib=dylib=crypto"); + let lib_name = if is_windows { "libcrypto" } else { "crypto" }; + println!("cargo:rustc-link-lib=dylib={}", lib_name); println!("cargo:rustc-link-search={}", lib_dir.to_string_lossy()); } else if is_apple { cfg.flag("-DSQLCIPHER_CRYPTO_CC");