RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-01-10 16:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

start building malloc_extension_c_test even with static linking

Browse Source 
Comment in Makefile.am stating that it doesn't work with static
linking is not accurate anymore.
This commit is contained in:
Aliaksey Kandratsenka 2014-12-21 19:52:34 -08:00
parent d570a6391c
commit 1035d5c18f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -660,12 +660,10 @@ malloc_extension_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
malloc_extension_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS) malloc_extension_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
malloc_extension_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS) malloc_extension_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
# This doesn't work with static linkage, because libtcmalloc.a isn't # This doesn't work with mingw, which links foo.a even though it
# happy with C linkage (it misses the stdc++ library). Likewise with # doesn't set ENABLE_STATIC. TODO(csilvers): set enable_static=true
# mingw, which links foo.a even though it doesn't set ENABLE_STATIC. # in configure.ac:36?
# TODO(csilvers): set enable_static=true in configure.ac:36?
if !MINGW if !MINGW
if !ENABLE_STATIC
TESTS += malloc_extension_c_test TESTS += malloc_extension_c_test
malloc_extension_c_test_SOURCES = src/tests/malloc_extension_c_test.c \ malloc_extension_c_test_SOURCES = src/tests/malloc_extension_c_test.c \
src/gperftools/malloc_extension.h \ src/gperftools/malloc_extension.h \
@ -676,8 +674,7 @@ if GCC
malloc_extension_c_test_CFLAGS += -ansi malloc_extension_c_test_CFLAGS += -ansi
endif GCC endif GCC
malloc_extension_c_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS) malloc_extension_c_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
malloc_extension_c_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS) -lstdc++ malloc_extension_c_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS) -lstdc++ -lm
endif !ENABLE_STATIC
endif !MINGW endif !MINGW
if !MINGW if !MINGW