From e644f6eb64037b1e21ce55d4dcffa43571ac1327 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Tue, 12 Jul 2016 16:07:53 +0800 Subject: [PATCH] ceph-fuse: link to libtcmalloc or jemalloc Fixes: http://tracker.ceph.com/issues/16655 Signed-off-by: Yan, Zheng --- src/CMakeLists.txt | 2 +- src/Makefile-env.am | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cec6efbe9197..d2b856f1ea46 100644 --- 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 ddffbd70a032..166cdc9b9a55 100644 --- 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) -- 2.47.3