summaryrefslogtreecommitdiff
path: root/configure.cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <vv221804@loki07>2009-12-23 04:44:25 +0100
committerVladislav Vaintroub <vv221804@loki07>2009-12-23 04:44:25 +0100
commit5dbbb867e1c38a37bc0a842581250113c7d61c00 (patch)
tree5cad11c4f7c5c82e47ee391a346a87e9b4aeba36 /configure.cmake
parent301f28c158359ba06858a02fd8cbc55f4ee28c80 (diff)
downloadmariadb-git-5dbbb867e1c38a37bc0a842581250113c7d61c00.tar.gz
restore flaky loadxml test, fix solaris plugin load using -lpthread instead of -lthread
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake
index a0db5669471..353d70aa571 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -284,6 +284,13 @@ IF(UNIX)
ENDIF()
FIND_PACKAGE(Threads)
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ # CMake defined -lthread as thread flag
+ # This crashes in dlopen when trying to load plugins
+ # Workaround with -lpthread
+ SET(CMAKE_THREADS_LIBS_INIT -lpthread)
+ ENDIF()
+
SET(CMAKE_REQUIRED_LIBRARIES
${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})