From 4decd2c386083c6c4c6122684f6fe597a35176e3 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 14 Sep 2025 17:48:06 +0100 Subject: [PATCH] cmake: remove Darwin/resolv quirks Since commit e98a32373 ("core: check if res_init requires linking with libresolv") we detect if/when we should be linking against libresolv. The detection seems a bit clunky (to me), although it's better to keep things consolidated/consistent across tree. Swap the Darwin checks with the new token LIBRESOLV_HAS_RES_INIT. Signed-off-by: Emil Velikov --- src/plugins/irc/CMakeLists.txt | 5 ++--- src/plugins/xfer/CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt index f6440be00..8f9fcf408 100644 --- a/src/plugins/irc/CMakeLists.txt +++ b/src/plugins/irc/CMakeLists.txt @@ -59,9 +59,8 @@ list(APPEND LINK_LIBS ${GNUTLS_LDFLAGS}) list(APPEND LINK_LIBS ${LIBGCRYPT_LDFLAGS}) -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # link with resolv lib on macOS - list(APPEND LINK_LIBS "resolv") +if(LIBRESOLV_HAS_RES_INIT) + list(APPEND LINK_LIBS ${RESOLV_LIBRARY}) endif() target_link_libraries(irc ${LINK_LIBS} coverage_config) diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt index aa7f1ab1e..3b8dba9be 100644 --- a/src/plugins/xfer/CMakeLists.txt +++ b/src/plugins/xfer/CMakeLists.txt @@ -38,9 +38,8 @@ set(LINK_LIBS) list(APPEND LINK_LIBS ${LIBGCRYPT_LDFLAGS}) -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # link with resolv lib on macOS - list(APPEND LINK_LIBS "resolv") +if(LIBRESOLV_HAS_RES_INIT) + list(APPEND LINK_LIBS ${RESOLV_LIBRARY}) endif() target_link_libraries(xfer ${LINK_LIBS} coverage_config)