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 /cmake | |
| parent | 27b762e23d8305bbc65dc61d283fe192e2dbd00a (diff) | |
| parent | 1e778a3b5624f97fdf44a15fd6cee3d615891cff (diff) | |
| download | mariadb-git-7b2bb67113bdda470955e3d4d72be0f2c0b38902.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/jemalloc.cmake | 2 | ||||
| -rw-r--r-- | cmake/ssl.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake index 5ad636d0e6c..b94a880cf05 100644 --- a/cmake/jemalloc.cmake +++ b/cmake/jemalloc.cmake @@ -17,7 +17,7 @@ MACRO (CHECK_JEMALLOC) IF(WITH_JEMALLOC STREQUAL "static") SET(libname jemalloc_pic) - SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) + SET(CMAKE_REQUIRED_LIBRARIES pthread ${CMAKE_DL_LIBS} m) SET(what bundled) ELSE() SET(libname jemalloc c) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 7143fce9e09..5f54d77752c 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -126,7 +126,7 @@ MACRO (MYSQL_CHECK_SSL) SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET}) ENDIF() IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL}) + SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${CMAKE_DL_LIBS}) ENDIF() MESSAGE_ONCE(OPENSSL_INCLUDE_DIR "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}") |