diff options
| author | Aliaksey Kandratsenka <alkondratenko@gmail.com> | 2017-09-23 14:55:20 -0700 |
|---|---|---|
| committer | Aliaksey Kandratsenka <alkondratenko@gmail.com> | 2017-09-23 14:55:20 -0700 |
| commit | fb5987d57913867e3b0f20490461ea55bfabe9ee (patch) | |
| tree | 3c020ed1b625bcfbbc8410eadc0efae5a19a687e /Makefile.am | |
| parent | 5815f02105acd5d7fd0e6ec038a9e96ccc36911f (diff) | |
| download | gperftools-fb5987d57913867e3b0f20490461ea55bfabe9ee.tar.gz | |
Revert "Ensure that lsan flags are appended on all necessary targets"
This reverts commit a3bf61ca81b68e7792739c451aceef00cf7d7d03.
Diffstat (limited to 'Makefile.am')
| -rwxr-xr-x | Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 6d289f9..eba0457 100755 --- a/Makefile.am +++ b/Makefile.am @@ -79,12 +79,8 @@ TCMALLOC_FLAGS = if MINGW TCMALLOC_FLAGS += -Wl,-u__tcmalloc endif MINGW - -# We must allow the lsan weak hook to be undefined in tcmalloc itself (AM_LDFLAGS) -# and in the libraries that use tcmalloc (TCMALLOC_FLAGS) if OSX AM_LDFLAGS += -Wl,-U,___lsan_ignore_object -TCMALLOC_FLAGS += -Wl,-U,___lsan_ignore_object endif OSX # If we have objcopy, make malloc/free/etc weak symbols. That way folks @@ -951,13 +947,13 @@ libtcmalloc_internal_la_SOURCES = $(libtcmalloc_minimal_internal_la_SOURCES) \ src/memory_region_map.cc libtcmalloc_internal_la_CXXFLAGS = $(PTHREAD_CFLAGS) -DNDEBUG \ $(AM_CXXFLAGS) $(EMERGENCY_MALLOC_DEFINE) -libtcmalloc_internal_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS) +libtcmalloc_internal_la_LDFLAGS = $(PTHREAD_CFLAGS) libtcmalloc_internal_la_LIBADD = libstacktrace.la $(PTHREAD_LIBS) lib_LTLIBRARIES += libtcmalloc.la libtcmalloc_la_SOURCES = $(TCMALLOC_CC) $(TCMALLOC_INCLUDES) libtcmalloc_la_CXXFLAGS = $(PTHREAD_CFLAGS) -DNDEBUG $(AM_CXXFLAGS) $(EMERGENCY_MALLOC_DEFINE) -libtcmalloc_la_LDFLAGS = $(PTHREAD_CFLAGS) -version-info @TCMALLOC_SO_VERSION@ $(AM_LDFLAGS) +libtcmalloc_la_LDFLAGS = $(PTHREAD_CFLAGS) -version-info @TCMALLOC_SO_VERSION@ libtcmalloc_la_LIBADD = libtcmalloc_internal.la libmaybe_threads.la $(PTHREAD_LIBS) if WITH_HEAP_CHECKER |