diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-15 20:21:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-15 20:21:11 +0300 |
| commit | 5c76e1e6931d83dce971aafc281e8525e01de9f8 (patch) | |
| tree | bc7c9be0dfcb9201e8c1dcfad9f40283f6eb8c2a /configure.cmake | |
| parent | a3e3225cd3b816d47621e749e21a71b6a864a96a (diff) | |
| parent | 3f8df01194700a68a62e6adbc62bd48d27dfe833 (diff) | |
| download | mariadb-git-5c76e1e6931d83dce971aafc281e8525e01de9f8.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.cmake b/configure.cmake index 3d6ff53164b..03bb6b044fe 100644 --- a/configure.cmake +++ b/configure.cmake @@ -134,6 +134,7 @@ IF(UNIX) IF(NOT LIBRT) MY_SEARCH_LIBS(clock_gettime rt LIBRT) ENDIF() + set(THREADS_PREFER_PTHREAD_FLAG ON) FIND_PACKAGE(Threads) SET(CMAKE_REQUIRED_LIBRARIES @@ -670,10 +671,10 @@ int main() " HAVE_PTHREAD_YIELD_ZERO_ARG) IF(NOT STACK_DIRECTION) - IF(CMAKE_CROSSCOMPILING) - MESSAGE(FATAL_ERROR - "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 " - "or -DSTACK_DIRECTION=-1 when calling cmake.") + IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) + MESSAGE(FATAL_ERROR + "STACK_DIRECTION is not defined. Please specify -DSTACK_DIRECTION=1 " + "or -DSTACK_DIRECTION=-1 when calling cmake.") ELSE() TRY_RUN(STACKDIR_RUN_RESULT STACKDIR_COMPILE_RESULT ${CMAKE_BINARY_DIR} |