diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
| commit | 7b2bb67113bdda470955e3d4d72be0f2c0b38902 (patch) | |
| tree | 9f9f34da1a4e48c243c56ff161987074ef907cbb /configure.cmake | |
| parent | 27b762e23d8305bbc65dc61d283fe192e2dbd00a (diff) | |
| parent | 1e778a3b5624f97fdf44a15fd6cee3d615891cff (diff) | |
| download | mariadb-git-7b2bb67113bdda470955e3d4d72be0f2c0b38902.tar.gz | |
Merge 10.3 into 10.4
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 b31c9e48388..1c8265e29f1 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) |