]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: link daemons against ${ALLOC_LIBS} 46103/head
authorKefu Chai <tchaikov@gmail.com>
Tue, 3 May 2022 04:22:05 +0000 (12:22 +0800)
committerKefu Chai <tchaikov@gmail.com>
Tue, 3 May 2022 13:50:14 +0000 (21:50 +0800)
to enable them to use the specified allocators

Fixes: https://tracker.ceph.com/issues/55519
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
src/CMakeLists.txt
src/mgr/CMakeLists.txt

index 563f08513150e75a707391e4215f736cd0bb4ce4..61a8616d5a773e0440b004e71619f1b38b2ff844 100644 (file)
@@ -616,8 +616,10 @@ add_executable(ceph-mon ${ceph_mon_srcs}
   $<TARGET_OBJECTS:common_texttable_obj>)
 add_dependencies(ceph-mon erasure_code_plugins)
 target_link_libraries(ceph-mon mon os global-static ceph-common
+  ${ALLOC_LIBS}
   ${EXTRALIBS}
-  ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+  ${CMAKE_DL_LIBS}
+  ${GSSAPI_LIBRARIES})
 install(TARGETS ceph-mon DESTINATION bin)
 
 # OSD/ObjectStore
@@ -645,6 +647,7 @@ set(ceph_osd_srcs
 add_executable(ceph-osd ${ceph_osd_srcs})
 add_dependencies(ceph-osd erasure_code_plugins)
 target_link_libraries(ceph-osd osd os global-static common
+  ${ALLOC_LIBS}
   ${BLKID_LIBRARIES})
 if(WITH_FUSE)
   target_link_libraries(ceph-osd FUSE::FUSE)
@@ -662,7 +665,8 @@ if (WITH_CEPHFS)
     ceph_mds.cc)
   add_executable(ceph-mds ${ceph_mds_srcs})
   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
-    Boost::thread)
+    Boost::thread
+    ${ALLOC_LIBS})
   install(TARGETS ceph-mds DESTINATION bin)
 endif()
 
index b11c40c42bc922e20c9622e86d4c4a77dbe5c422..f9ec04317f4be64fde5fe59af382a5b70d66bb9b 100644 (file)
@@ -44,7 +44,10 @@ if(WITH_MGR)
     osdc client heap_profiler
     global-static ceph-common
     Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-    Python3::Python ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+    Python3::Python
+    ${ALLOC_LIBS}
+    ${CMAKE_DL_LIBS}
+    ${GSSAPI_LIBRARIES})
   set_target_properties(ceph-mgr PROPERTIES
     POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
   install(TARGETS ceph-mgr DESTINATION bin)