ceph-fuse: link to libtcmalloc or jemalloc

Fixes: http://tracker.ceph.com/issues/16655
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit e644f6eb64037b1e21ce55d4dcffa43571ac1327)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0bdac9d6e7297dae4c20d4f9c7459399593afdc..991da1480ec3e674c040b2c3e65ab4763f6b3334 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -972,7 +972,7 @@ endif(${ENABLE_SHARED})
       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)
   endif(HAVE_LIBFUSE)

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index df225d684731631c189169611fb85051ff63c2cb..4771bad02d6f2316678fa4b5f0830094605b3d6b 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)