diff --git a/pgx-pg-sys/build.rs b/pgx-pg-sys/build.rs
index b78620379..e13614a2e 100644
--- a/pgx-pg-sys/build.rs
+++ b/pgx-pg-sys/build.rs
@@ -586,8 +586,9 @@ fn build_shim_for_version(
         .unwrap();
     }
 
+    let make = option_env!("MAKE").unwrap_or("make").to_string();
     let rc = run_command(
-        Command::new("make")
+        Command::new(make)
             .arg("clean")
             .arg(&format!("libpgx-cshim-{}.a", major_version))
             .env("PG_TARGET_VERSION", format!("{}", major_version))
diff --git a/pgx-pg-sys/src/submodules/mod.rs b/pgx-pg-sys/src/submodules/mod.rs
index 4ec96221f..240ffd6df 100644
--- a/pgx-pg-sys/src/submodules/mod.rs
+++ b/pgx-pg-sys/src/submodules/mod.rs
@@ -27,7 +27,7 @@ extern "C" {
     ) -> std::os::raw::c_int;
 }
 
-#[cfg(any(target_os = "macos", target_os = "freebsd"))]
+#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "openbsd"))]
 extern "C" {
     pub(crate) fn sigsetjmp(
         env: *mut crate::sigjmp_buf,