summaryrefslogtreecommitdiff
path: root/configure.cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-01-19 16:31:21 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-01-19 16:31:21 +0100
commit8bffa163f80aedb4e9c01f1652c1e98fa4be68a8 (patch)
tree3a654eb9e366f96de7f87db2448355e841cf2f62 /configure.cmake
parent6b596534c024b2380e8a20473d4953d348956c37 (diff)
downloadmariadb-git-8bffa163f80aedb4e9c01f1652c1e98fa4be68a8.tar.gz
Fix various compiler/OS compatibility errors
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake10
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake
index e155b661259..25cc6f5cb52 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -284,9 +284,13 @@ IF(UNIX)
IF(NOT LIBM)
MY_SEARCH_LIBS(__infinity m LIBM)
ENDIF()
- IF(NOT LIBM)
- MY_SEARCH_LIBS(rint m LIBM)
- ENDIF()
+
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ # On Solaris, use of intrinsics will screw the lib search logic
+ # Force using -lm, so rint etc are found.
+ SET(LIBM m)
+ ENDIF()
+
MY_SEARCH_LIBS(gethostbyname_r "nsl_r;nsl" LIBNSL)
MY_SEARCH_LIBS(bind "bind;socket" LIBBIND)
MY_SEARCH_LIBS(crypt crypt LIBCRYPT)