From a1ff63353f613eb80d60f14c0e315b53b142c78c Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Tue, 27 Mar 2018 13:49:53 -0400 Subject: [PATCH] radosgw: conditionally link with tcmalloc The radosgw program should be linked with tcmalloc (or tcmalloc_minimal) when selected by the build (i.e, whenever other Ceph daemons such as ceph-osd would be. Just adding $(LIBTCMALLOC) to the linkage directive is sufficient to do this. Fixes: http://tracker.ceph.com/issues/23469 Signed-off-by: Matt Benjamin --- src/rgw/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index 1fdc087f7d167..22d8f30d28ed9 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -151,8 +151,8 @@ radosgw_SOURCES = \ rgw/rgw_main.cc radosgw_CFLAGS = -I$(srcdir)/civetweb/include -fPIC -I$(srcdir)/xxHash ${CIVETWEB_INCLUDE} $(SONAME_DEFINES) -radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBCIVETWEB_DEPS) $(LIBRGW_DEPS) $(RESOLV_LIBS) \ - $(CEPH_GLOBAL) +radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBCIVETWEB_DEPS) $(LIBRGW_DEPS) \ + $(RESOLV_LIBS) $(CEPH_GLOBAL) $(LIBTCMALLOC) bin_PROGRAMS += radosgw radosgw_admin_SOURCES = rgw/rgw_admin.cc rgw/rgw_orphan.cc -- 2.39.5