commit 947de40d198d83e561320afe5d0146f43dc9192a Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 5 15:07:08 2018 -0400

Move openbsd-malloc responsibility to lib/malloc

(Note that this is not believed to work, but we may as well have it in the right place till we remove it) --- src/common/include.am | 6 ------ src/lib/malloc/include.am | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/common/include.am b/src/common/include.am index 0a58a39ae..8a2d2e114 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -11,12 +11,6 @@ endif

EXTRA_DIST += src/common/Makefile.nmake

-if USE_OPENBSD_MALLOC -libor_extra_source=src/ext/OpenBSD_malloc_Linux.c -else -libor_extra_source= -endif - LIBOR_A_SRC = \ src/common/token_bucket.c \ src/common/workqueue.c \ diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am index b4c5cae54..50de9cb73 100644 --- a/src/lib/malloc/include.am +++ b/src/lib/malloc/include.am @@ -8,6 +8,10 @@ endif src_lib_libtor_malloc_a_SOURCES = \ src/lib/malloc/util_malloc.c

+if USE_OPENBSD_MALLOC +src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c +endif + src_lib_libtor_malloc_testing_a_SOURCES = \ $(src_lib_libtor_malloc_a_SOURCES) src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)