From 35eb28bc76da8501c344b0e0e3320ce51a495383 Mon Sep 17 00:00:00 2001 From: ojab ojab Date: Sun, 21 Jul 2024 17:05:15 -0400 Subject: [PATCH] bootstrap: Restore support for system jsoncpp and uv without pkg-config In commit da5de7f9f3 (bootstrap: Allow --boostrap-system-* libraries custom prefixes, 2024-03-03, v3.30.0-rc1~456^2) the non-pkg-config code path for uv/jsoncpp/rhash all set `use_librhash_ldflags` instead of their own variable. --- bootstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index 49b91d578a..88878fed1e 100755 --- a/bootstrap +++ b/bootstrap @@ -1811,7 +1811,7 @@ else cmake_c_flags="${cmake_c_flags} ${use_uv_flags}" cmake_cxx_flags="${cmake_cxx_flags} ${use_uv_flags}" else - use_librhash_ldflags="-luv" + use_uv_ldflags="-luv" fi libs="${libs} ${use_uv_ldflags}" fi @@ -1838,7 +1838,7 @@ else use_jsoncpp_ldflags="`pkg-config --libs jsoncpp`" cmake_cxx_flags="${cmake_cxx_flags} ${use_jsoncpp_flags}" else - use_librhash_ldflags="-ljsoncpp" + use_jsoncpp_ldflags="-ljsoncpp" fi libs="${libs} ${use_jsoncpp_ldflags}" fi