Fix for ASAN/TSAN build

mariadb-corporation · Nov 8, 2018 · f522488 · f522488
1 parent f1ef0d1
commit f522488
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -212,6 +212,9 @@ ENDIF()
 
 IF(UNIX)
   SEARCH_LIBRARY(LIBDL dlopen "dl")
+  IF(NOT ${LIBDL})
+    SEARCH_LIBRARY(LIBDL dlsym "dl")
+  ENDIF()
   SEARCH_LIBRARY(LIBM floor m)
   SEARCH_LIBRARY(LIBPTHREAD pthread_getspecific "pthread;pthreads")
   SEARCH_LIBRARY(LIBNSL gethostbyname_r "nsl_r;nsl")

diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -404,7 +404,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
 ENDIF()
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  IF (NOT WITH_ASAN)
+  IF (NOT WITH_ASAN AND NOT WITH_TSAN)
     TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
   ENDIF()
   SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")