From: Bassam Tabbara Date: Mon, 12 Dec 2016 22:16:40 +0000 (-0500) Subject: cmake: disable mallinfo for jemalloc X-Git-Tag: v12.0.0~375^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d02fda1704adc70ada0f905d4e1f7e330d0ebde;p=ceph.git cmake: disable mallinfo for jemalloc jemalloc does not implement mallinfo. Only check for existence of mallinfo when the allocator is not jemalloc. Signed-off-by: Bassam Tabbara --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c70e6648a138..1b41d0fa0b37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,6 @@ CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE) CHECK_FUNCTION_EXISTS(posix_fallocate HAVE_POSIX_FALLOCATE) CHECK_FUNCTION_EXISTS(syncfs HAVE_SYS_SYNCFS) CHECK_FUNCTION_EXISTS(sync_file_range HAVE_SYNC_FILE_RANGE) -CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_FUNCTION_EXISTS(pwritev HAVE_PWRITEV) CHECK_FUNCTION_EXISTS(splice CEPH_HAVE_SPLICE) CHECK_FUNCTION_EXISTS(getgrouplist HAVE_GETGROUPLIST) @@ -285,6 +284,11 @@ else(ALLOCATOR) endif(GPERFTOOLS_FOUND) endif(ALLOCATOR) +# jemalloc does not support mallinfo +if(NOT JEMALLOC_FOUND) + CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) +endif() + if(WITH_LIBCEPHFS OR WITH_RBD) find_package(keyutils REQUIRED) endif()