From 46256e0f05dae0079657edb76be1d4abd7f264b1 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 12 Nov 2023 14:09:03 +0000
Subject: [PATCH] fixup! cmake: Check system symbols

Refactor out the `TestAppendRequiredLibraries` module.
---
 cmake/introspection.cmake                     | 24 ++-----------
 .../module/TestAppendRequiredLibraries.cmake  | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 cmake/module/TestAppendRequiredLibraries.cmake

diff --git a/cmake/introspection.cmake b/cmake/introspection.cmake
index 0462ede322d6e..bb5d9cbee7b20 100644
--- a/cmake/introspection.cmake
+++ b/cmake/introspection.cmake
@@ -75,29 +75,9 @@ check_include_file_cxx(ifaddrs.h HAVE_IFADDRS_H)
 if(HAVE_SYS_TYPES_H AND HAVE_IFADDRS_H)
   check_cxx_symbol_exists(freeifaddrs "sys/types.h;ifaddrs.h" HAVE_DECL_FREEIFADDRS)
   check_cxx_symbol_exists(getifaddrs "sys/types.h;ifaddrs.h" HAVE_DECL_GETIFADDRS)
-  # Illumos/SmartOS requires linking with -lsocket if
-  # using getifaddrs & freeifaddrs.
-  # See: https://github.com/bitcoin/bitcoin/pull/21486
   if(HAVE_DECL_GETIFADDRS AND HAVE_DECL_FREEIFADDRS)
-    set(check_socket_source "
-      #include <sys/types.h>
-      #include <ifaddrs.h>
-
-      int main() {
-        struct ifaddrs* ifaddr;
-        getifaddrs(&ifaddr);
-        freeifaddrs(ifaddr);
-      }
-    ")
-    check_cxx_source_links("${check_socket_source}" IFADDR_LINKS_WITHOUT_LIBSOCKET)
-    if(NOT IFADDR_LINKS_WITHOUT_LIBSOCKET)
-      check_cxx_source_links_with_libs(socket "${check_socket_source}" IFADDR_NEEDS_LINK_TO_LIBSOCKET)
-      if(IFADDR_NEEDS_LINK_TO_LIBSOCKET)
-        link_libraries(socket)
-      else()
-        message(FATAL_ERROR "Cannot figure out how to use getifaddrs/freeifaddrs.")
-      endif()
-    endif()
+    include(TestAppendRequiredLibraries)
+    test_append_socket_library(core)
   endif()
 endif()
 
diff --git a/cmake/module/TestAppendRequiredLibraries.cmake b/cmake/module/TestAppendRequiredLibraries.cmake
new file mode 100644
index 0000000000000..936e55b662ca8
--- /dev/null
+++ b/cmake/module/TestAppendRequiredLibraries.cmake
@@ -0,0 +1,34 @@
+# Copyright (c) 2023-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit/.
+
+include_guard(GLOBAL)
+
+# Illumos/SmartOS requires linking with -lsocket if
+# using getifaddrs & freeifaddrs.
+# See: https://github.com/bitcoin/bitcoin/pull/21486
+function(test_append_socket_library target)
+  set(check_socket_source "
+    #include <sys/types.h>
+    #include <ifaddrs.h>
+
+    int main() {
+      struct ifaddrs* ifaddr;
+      getifaddrs(&ifaddr);
+      freeifaddrs(ifaddr);
+    }
+  ")
+
+  include(CheckSourceCompilesAndLinks)
+  check_cxx_source_links("${check_socket_source}" IFADDR_LINKS_WITHOUT_LIBSOCKET)
+  if(IFADDR_LINKS_WITHOUT_LIBSOCKET)
+    return()
+  endif()
+
+  check_cxx_source_links_with_libs(socket "${check_socket_source}" IFADDR_NEEDS_LINK_TO_LIBSOCKET)
+  if(IFADDR_NEEDS_LINK_TO_LIBSOCKET)
+    target_link_libraries(${target} INTERFACE socket)
+  else()
+    message(FATAL_ERROR "Cannot figure out how to use getifaddrs/freeifaddrs.")
+  endif()
+endfunction()