ceph-fuse: link to libtcmalloc or jemalloc

Fixes: http://tracker.ceph.com/issues/16655
Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cec6efbe91974b5adfaa663d5e3a9e5e73ab64b5..d2b856f1ea46c6872a3bf3dea0aa4c126ad0d5c0 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1163,7 +1163,7 @@ if(WITH_LIBCEPHFS)
       ceph_fuse.cc
       client/fuse_ll.cc)
     add_executable(ceph-fuse ${ceph_fuse_srcs})
-    target_link_libraries(ceph-fuse ${FUSE_LIBRARIES} client global)
+    target_link_libraries(ceph-fuse ${ALLOC_LIBS} ${FUSE_LIBRARIES} client global)
     set_target_properties(ceph-fuse PROPERTIES COMPILE_FLAGS "-I${FUSE_INCLUDE_DIRS}")
     install(TARGETS ceph-fuse DESTINATION bin)
     install(PROGRAMS mount.fuse.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index ddffbd70a0327698eef178adbd689cbfb323c79a..166cdc9b9a55e578289a54016bb4e6844ef238fe 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -250,6 +250,7 @@ LIBMON += -ljemalloc
 LIBOSD += -ljemalloc
 LIBMDS += -ljemalloc
 LIBRGW += -ljemalloc
+LIBCLIENT_FUSE += -ljemalloc
 endif # WITH_JEMALLOC
 
 if ENABLE_COVERAGE
@@ -265,6 +266,7 @@ LIBOSD += $(LIBOSDC) $(LIBOS)
 LIBMON += $(LIBPERFGLUE)
 LIBOSD += $(LIBPERFGLUE)
 LIBMDS += $(LIBPERFGLUE)
+LIBCLIENT_FUSE += $(LIBPERFGLUE)
 
 # OSD needs types
 LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES)