From 319402fc746355a8e24603e6a9e9f06d2ca99c57 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Tue, 14 Mar 2023 11:25:48 +0100 Subject: [PATCH] postgres_ffi: restore POSTGRES_INSTALL_DIR support (#3811) Fix path construction to `pg_config`: `pg_install_dir_versioned` already includes `pg_version` --- libs/postgres_ffi/build.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/postgres_ffi/build.rs b/libs/postgres_ffi/build.rs index 25ff398bbd..66221af522 100644 --- a/libs/postgres_ffi/build.rs +++ b/libs/postgres_ffi/build.rs @@ -63,10 +63,7 @@ fn main() -> anyhow::Result<()> { pg_install_dir_versioned = cwd.join("..").join("..").join(pg_install_dir_versioned); } - let pg_config_bin = pg_install_dir_versioned - .join(pg_version) - .join("bin") - .join("pg_config"); + let pg_config_bin = pg_install_dir_versioned.join("bin").join("pg_config"); let inc_server_path: String = if pg_config_bin.exists() { let output = Command::new(pg_config_bin) .arg("--includedir-server")