Also link openssl on windows

sgrif · Jun 8, 2024 · 8904805 · 8904805
1 parent 1bfca6b
commit 8904805
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,7 +89,7 @@ jobs:
 
       - name: Test compile diesel
         shell: bash
-        # currently broken as diesel does not allow pq-sys 0.5 yet
+        # allow to fail as diesel might not pull in the right feature yet
         continue-on-error: true
         run: |
           cargo new test_diesel

diff --git a/pq-src/Cargo.toml b/pq-src/Cargo.toml
@@ -22,8 +22,8 @@ keywords = ["bindings", "libpq", "pq-sys", "bundled"]
 categories = ["database", "external-ffi-bindings"]
 readme = "README.md"
 
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-openssl-sys = "0.9.93"
+[dependencies]
+openssl-sys = { version = "0.9.93", features = ["vendored"] }
 
 [build-dependencies]
 cc = "1.0.83"

diff --git a/pq-src/build.rs b/pq-src/build.rs
@@ -78,22 +78,14 @@ const LIBCOMMON_BASE: &[&str] = &[
     "restricted_token.c",
     "sprompt.c",
     "logging.c",
-];
-
-const LIBCOMMON_NOT_WINDOWS: &[&str] = &[
     "cryptohash_openssl.c",
     "hmac_openssl.c",
     "protocol_openssl.c",
 ];
 
-const LIBCOMMON_WINDOWS: &[&str] = &[
-    "cryptohash.c",
-    "hmac.c",
-    "md5.c",
-    "sha1.c",
-    "sha2.c",
-    "wchar.c",
-];
+const LIBCOMMON_NOT_WINDOWS: &[&str] = &[];
+
+const LIBCOMMON_WINDOWS: &[&str] = &["wchar.c"];
 
 const LIBPQ_BASE: &[&str] = &[
     "fe-auth-scram.c",
@@ -109,9 +101,11 @@ const LIBPQ_BASE: &[&str] = &[
     "legacy-pqsignal.c",
     "libpq-events.c",
     "pqexpbuffer.c",
+    "fe-secure-common.c",
+    "fe-secure-openssl.c",
 ];
 
-const LIBPQ_NOT_WINDOWS: &[&str] = &["fe-secure-common.c", "fe-secure-openssl.c"];
+const LIBPQ_NOT_WINDOWS: &[&str] = &[];
 
 const LIBPQ_WINDOWS: &[&str] = &["fe-secure.c", "pthread-win32.c", "win32.c"];
 

diff --git a/pq-src/src/lib.rs b/pq-src/src/lib.rs
@@ -1,2 +1 @@
-#[cfg(not(target_os = "windows"))]
 extern crate openssl_sys;
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		#[cfg(not(target_os = "windows"))]
		extern crate openssl_sys;