echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FindThreads: Drop try_run to improve cross-compiling support

Browse Source 
Use `try_compile` instead of `try_run`.  It is not clear why `try_run`
was ever needed, and it does not work during cross-compiling.

Update the check's source file to remove code associated with actually
running things.  Also remove the ancient `__CLASSIC_C__` code path and
use a simple `int main(void)` as in `Modules/CheckIncludeFile.c.in`.

Fixes: #16920
This commit is contained in:
Steffen Dettmer 2017-08-07 15:30:33 +02:00 committed by Brad King
parent f4aa346538
commit d4e551a90b
2 changed files with 11 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Modules/CheckForPthreads.c
View File

@ -1,41 +1,15 @@
#include <pthread.h> #include <pthread.h>
#include <stdio.h>
#include <unistd.h>
void* runner(void*); void* start_routine(void* args)
int res = 0;
#ifdef __CLASSIC_C__
int main()
{ {
int ac; return args;
char* av[];
#else
int main(int ac, char* av[])
{
#endif
pthread_t tid[2];
pthread_create(&tid[0], 0, runner, (void*)1);
pthread_create(&tid[1], 0, runner, (void*)2);
#if defined(__BEOS__) && !defined(__ZETA__) /* (no usleep on BeOS 5.) */
usleep(1); /* for strange behavior on single-processor sun */
#endif
pthread_join(tid[0], 0);
pthread_join(tid[1], 0);
if (ac > 1000) {
return *av[0];
}
return res;
} }
void* runner(void* args) int main(void)
{ {
int cc; /* This is a compile and link test, no code to actually run things. */
for (cc = 0; cc < 10; cc++) { pthread_t thread;
printf("%p CC: %d\n", args, cc); pthread_create(&thread, 0, start_routine, 0);
} pthread_join(thread, 0);
res++;
return 0; return 0;
} }

15
Modules/FindThreads.cmake
View File

@ -86,23 +86,16 @@ macro(_check_pthreads_flag)
set(_threads_src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindThreads/CheckForPthreads.cxx) set(_threads_src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindThreads/CheckForPthreads.cxx)
configure_file(${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c "${_threads_src}" COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c "${_threads_src}" COPYONLY)
endif() endif()
try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG try_compile(THREADS_HAVE_PTHREAD_ARG
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${_threads_src} ${_threads_src}
CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
COMPILE_OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
unset(_threads_src) unset(_threads_src)
if(THREADS_HAVE_PTHREAD_ARG) if(THREADS_HAVE_PTHREAD_ARG)
if(THREADS_PTHREAD_ARG STREQUAL "2") set(Threads_FOUND TRUE)
set(Threads_FOUND TRUE) message(STATUS "Check if compiler accepts -pthread - yes")
message(STATUS "Check if compiler accepts -pthread - yes")
else()
message(STATUS "Check if compiler accepts -pthread - no")
file(APPEND
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if compiler accepts -pthread returned ${THREADS_PTHREAD_ARG} instead of 2. The compiler had the following output:\n${OUTPUT}\n\n")
endif()
else() else()
message(STATUS "Check if compiler accepts -pthread - no") message(STATUS "Check if compiler accepts -pthread - no")
file(APPEND file(APPEND