From 6fee38e5e730d24deb41f1e258be20d7084371a1 Mon Sep 17 00:00:00 2001 From: Aliaksei Kandratsenka Date: Sun, 29 Sep 2024 14:01:18 -0400 Subject: [PATCH] build symbolizer stuff only for debug allocator Since it is now the only place that uses it --- CMakeLists.txt | 5 ++--- Makefile.am | 11 +++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bb1d06..2f62b47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,7 +529,6 @@ set(MINIMAL_MALLOC_SRC src/span.cc src/stack_trace_table.cc src/static_vars.cc - src/symbolize.cc src/thread_cache.cc src/thread_cache_ptr.cc src/malloc_hook.cc @@ -678,7 +677,7 @@ endif() ### ------- tcmalloc_minimal_debug (thread-caching malloc with debugallocation) if(GPERFTOOLS_BUILD_DEBUGALLOC) - add_library(tcmalloc_minimal_debug src/debugallocation.cc ${MINIMAL_MALLOC_SRC}) + add_library(tcmalloc_minimal_debug src/debugallocation.cc src/symbolize.cc ${MINIMAL_MALLOC_SRC}) target_compile_definitions(tcmalloc_minimal_debug PRIVATE NO_TCMALLOC_SAMPLES) target_link_libraries(tcmalloc_minimal_debug PRIVATE common) @@ -806,7 +805,7 @@ endif() ### ------- tcmalloc with debugallocation if(GPERFTOOLS_BUILD_DEBUGALLOC) if(GPERFTOOLS_BUILD_HEAP_PROFILER) - add_library(tcmalloc_debug src/debugallocation.cc ${FULL_MALLOC_SRC}) + add_library(tcmalloc_debug src/debugallocation.cc src/symbolize.cc ${FULL_MALLOC_SRC}) target_compile_definitions(tcmalloc_debug PRIVATE ${EMERGENCY_MALLOC_DEFINE}) target_link_libraries(tcmalloc_debug PRIVATE stacktrace common) diff --git a/Makefile.am b/Makefile.am index 933a56d..2fab17c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -276,7 +276,6 @@ MINIMAL_MALLOC_SRC = src/common.cc \ src/span.cc \ src/stack_trace_table.cc \ src/static_vars.cc \ - src/symbolize.cc \ src/thread_cache.cc \ src/thread_cache_ptr.cc \ src/malloc_hook.cc \ @@ -506,11 +505,15 @@ dist_doc_DATA += docs/overview.dot \ if WITH_DEBUGALLOC +noinst_LTLIBRARIES += libsymbolize.la +libsymbolize_la_SOURCES = src/symbolize.cc + lib_LTLIBRARIES += libtcmalloc_minimal_debug.la -libtcmalloc_minimal_debug_la_SOURCES = src/debugallocation.cc $(MINIMAL_MALLOC_SRC) +libtcmalloc_minimal_debug_la_SOURCES = src/debugallocation.cc \ + $(MINIMAL_MALLOC_SRC) libtcmalloc_minimal_debug_la_CXXFLAGS = $(libtcmalloc_minimal_la_CXXFLAGS) libtcmalloc_minimal_debug_la_LDFLAGS = $(libtcmalloc_minimal_la_LDFLAGS) -libtcmalloc_minimal_debug_la_LIBADD = $(libtcmalloc_minimal_la_LIBADD) +libtcmalloc_minimal_debug_la_LIBADD = libsymbolize.la $(libtcmalloc_minimal_la_LIBADD) ### Unittests @@ -736,7 +739,7 @@ lib_LTLIBRARIES += libtcmalloc_debug.la libtcmalloc_debug_la_SOURCES = src/debugallocation.cc $(FULL_MALLOC_SRC) libtcmalloc_debug_la_CXXFLAGS = $(libtcmalloc_la_CXXFLAGS) libtcmalloc_debug_la_LDFLAGS = $(libtcmalloc_la_LDFLAGS) -libtcmalloc_debug_la_LIBADD = $(libtcmalloc_la_LIBADD) +libtcmalloc_debug_la_LIBADD = libsymbolize.la $(libtcmalloc_la_LIBADD) ### Unittests