diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 11:15:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 11:15:30 +0200 |
| commit | 898521e2dd8a4a6706cba01b6ef0a7cea4114fd0 (patch) | |
| tree | 4ef9a6ddc4298574bb75db673c2412f83c107c5b /configure.cmake | |
| parent | 571bcf9aaaf59b84e24bbfb809738dea25495d78 (diff) | |
| parent | 199863d72b7cccaa4c75641c50c45a83b568ab8c (diff) | |
| download | mariadb-git-898521e2dd8a4a6706cba01b6ef0a7cea4114fd0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index 8533b8ee0b2..64be91606ae 100644 --- a/configure.cmake +++ b/configure.cmake @@ -130,7 +130,6 @@ IF(UNIX) MY_SEARCH_LIBS(bind "bind;socket" LIBBIND) MY_SEARCH_LIBS(crypt crypt LIBCRYPT) MY_SEARCH_LIBS(setsockopt socket LIBSOCKET) - MY_SEARCH_LIBS(dlopen dl LIBDL) MY_SEARCH_LIBS(sched_yield rt LIBRT) IF(NOT LIBRT) MY_SEARCH_LIBS(clock_gettime rt LIBRT) @@ -138,7 +137,7 @@ IF(UNIX) FIND_PACKAGE(Threads) SET(CMAKE_REQUIRED_LIBRARIES - ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO}) + ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO}) # Need explicit pthread for gcc -fsanitize=address IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=") SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread) |