From 0e8925fddf1d479896d4b4910cb466f3b6666b86 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 20 Mar 2019 09:23:45 +0300 Subject: [PATCH] Support MSYS builds by CMake * CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && HOST=.*-.*-msys.*] (GC_THREADS, _REENTRANT): Define macro. * CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && HOST=.*-.*-msys.* && enable_parallel_mark] (PARALLEL_MARK): Likewise. * CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && HOST=.*-.*-msys.* && enable_thread_local_alloc] (THREAD_LOCAL_ALLOC): Likewise. * CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && HOST=.*-.*-msys.* && enable_thread_local_alloc] (SRC): Add thread_local_alloc.c. * CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && HOST=.*-.*-msys.*] (SRC): Add win32_threads.c. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04c45e18..97de33e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ MESSAGE("HOST = ${HOST}") IF(CMAKE_USE_PTHREADS_INIT) SET(SRC ${SRC} pthread_start.c pthread_support.c pthread_stop_world.c) # Common defines for most POSIX platforms. - IF( HOST MATCHES .*-.*-aix.*|.*-.*-android.*|.*-.*-cygwin.*|.*-.*-darwin.*|.*-.*-.*freebsd.*|.*-.*-haiku.*|.*-.*-gnu.*|.*-.*-hpux11.*|.*-.*-irix.*|.*-.*-.*linux.*|.*-.*-nacl.*|.*-.*-netbsd.*|.*-.*-openbsd.*|.*-.*-osf.*|.*-.*-solaris.*) + IF( HOST MATCHES .*-.*-aix.*|.*-.*-android.*|.*-.*-cygwin.*|.*-.*-darwin.*|.*-.*-.*freebsd.*|.*-.*-haiku.*|.*-.*-gnu.*|.*-.*-hpux11.*|.*-.*-irix.*|.*-.*-.*linux.*|.*-.*-msys.*|.*-.*-nacl.*|.*-.*-netbsd.*|.*-.*-openbsd.*|.*-.*-osf.*|.*-.*-solaris.*) ADD_DEFINITIONS("-DGC_THREADS -D_REENTRANT") IF(enable_parallel_mark) ADD_DEFINITIONS("-DPARALLEL_MARK") @@ -114,7 +114,7 @@ IF(CMAKE_USE_PTHREADS_INIT) ADD_DEFINITIONS("-DHANDLE_FORK") ENDIF(enable_handle_fork) ENDIF() - IF ( HOST MATCHES .*-.*-cygwin.*) + IF ( HOST MATCHES .*-.*-cygwin.*|.*-.*-msys.*) SET(SRC ${SRC} win32_threads.c) ENDIF() IF ( HOST MATCHES .*-.*-darwin.*) -- 2.40.0