From 758c78ed196c60ad69678d720b12893821c27107 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Sun, 31 Dec 2023 16:37:10 +0100 Subject: [PATCH] configure: Use the system `PKG_CONFIG_PATH` I noticed this while working on a nix devShell to work on CLN. We are blanked overriding the `pkg-config` search path, which can cause some trouble. Specifically `nix` uses content addressable locations, and macOS arm64 and x84_64 use separate `pkg-config` search paths, and by overwriting it we can cause a mix of different architectures failing the compilation Changelog-Fixed: configure: We now respect the `PKG_CONFIG_PATH` environment variable --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 5e546a559ea2..f1dac06606da 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ export PKG_CONFIG_PATH=/opt/homebrew/opt/sqlite/lib/pkgconfig else CPATH=/usr/local/lib LIBRARY_PATH=/usr/local/lib -export PKG_CONFIG_PATH=/usr/local/opt/sqlite/lib/pkgconfig +export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/sqlite/lib/pkgconfig fi : ${PKG_CONFIG=pkg-config}