From e0296d9cddbb0dfc4d4a1e408e1392b0caf3f6f2 Mon Sep 17 00:00:00 2001
From: Guillaume DELACOURT <guillaume.delacourt@thalesgroup.com>
Date: Tue, 23 May 2023 16:11:14 +0200
Subject: [PATCH] Checks for pthread setname and setaffinity API are
 compilation checks, not execution checks.

---
 CMakeLists.txt                                | 28 +++++++++++--------
 builds/cmake/Modules/ZMQSourceRunChecks.cmake | 10 +++----
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0e405353b..03462271e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -730,20 +730,24 @@ if(NOT ANDROID)
 endif()
 
 # -----------------------------------------------------------------------------
-if(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
-  zmq_check_sock_cloexec()
-  zmq_check_o_cloexec()
-  zmq_check_so_bindtodevice()
-  zmq_check_so_keepalive()
-  zmq_check_so_priority()
-  zmq_check_tcp_keepcnt()
-  zmq_check_tcp_keepidle()
-  zmq_check_tcp_keepintvl()
-  zmq_check_tcp_keepalive()
-  zmq_check_tcp_tipc()
+if (NOT MSVC)
+  # Compilation checks
   zmq_check_pthread_setname()
   zmq_check_pthread_setaffinity()
-  zmq_check_getrandom()
+  # Execution checks
+  if(NOT CMAKE_CROSSCOMPILING)
+    zmq_check_sock_cloexec()
+    zmq_check_o_cloexec()
+    zmq_check_so_bindtodevice()
+    zmq_check_so_keepalive()
+    zmq_check_so_priority()
+    zmq_check_tcp_keepcnt()
+    zmq_check_tcp_keepidle()
+    zmq_check_tcp_keepintvl()
+    zmq_check_tcp_keepalive()
+    zmq_check_tcp_tipc()
+    zmq_check_getrandom()
+  endif()
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux"
diff --git a/builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake
index 1c2a36e0c5..8dfcea3409 100644
--- a/builds/cmake/Modules/ZMQSourceRunChecks.cmake
+++ b/builds/cmake/Modules/ZMQSourceRunChecks.cmake
@@ -212,7 +212,7 @@ macro(zmq_check_pthread_setname)
   message(STATUS "Checking pthread_setname signature")
   set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
   set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
-  check_c_source_runs(
+  check_c_source_compiles(
     "
 #include <pthread.h>
 
@@ -223,7 +223,7 @@ int main(int argc, char *argv [])
 }
 "
     ZMQ_HAVE_PTHREAD_SETNAME_1)
-  check_c_source_runs(
+  check_c_source_compiles(
     "
 #include <pthread.h>
 
@@ -234,7 +234,7 @@ int main(int argc, char *argv [])
 }
 "
     ZMQ_HAVE_PTHREAD_SETNAME_2)
-  check_c_source_runs(
+  check_c_source_compiles(
     "
 #include <pthread.h>
 
@@ -245,7 +245,7 @@ int main(int argc, char *argv [])
 }
 "
     ZMQ_HAVE_PTHREAD_SETNAME_3)
-  check_c_source_runs(
+  check_c_source_compiles(
     "
 #include <pthread.h>
 
@@ -263,7 +263,7 @@ macro(zmq_check_pthread_setaffinity)
   message(STATUS "Checking pthread_setaffinity signature")
   set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
   set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
-  check_c_source_runs(
+  check_c_source_compiles(
     "
 #include <pthread.h>