diff options
| author | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-09-19 12:55:16 +0000 |
|---|---|---|
| committer | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-09-19 12:55:16 +0000 |
| commit | 0e91d185cac51ed1b2c9163afca998660ebda08e (patch) | |
| tree | a154d70d8918dd48c9ec161c94fff037d05ea113 /Makefile.am | |
| parent | Allow generating minidumps from live process on Linux via ExceptionHandler (diff) | |
| download | breakpad-0e91d185cac51ed1b2c9163afca998660ebda08e.tar.xz | |
Minidumps never contain MD_LINUX_DSO_DEBUG info when breakpad is in a shared library
A=Mike Hommey <mh@glandium.org>
R=ted at http://breakpad.appspot.com/422002/
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1044 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 1f6f10cf..7eefdd5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ # This allows #includes to be relative to src/ AM_CPPFLAGS = -I$(top_srcdir)/src - +AM_CFLAGS = AM_CXXFLAGS = if ANDROID_HOST @@ -53,6 +53,12 @@ AM_CXXFLAGS += \ -Werror=overloaded-virtual endif +if LINUX_HOST +# Build as PIC on Linux, for linux_client_unittest_shlib +AM_CFLAGS += -fPIC +AM_CXXFLAGS += -fPIC +endif + # Specify include paths for ac macros ACLOCAL_AMFLAGS = -I m4 @@ -281,6 +287,9 @@ check_PROGRAMS += \ endif if LINUX_HOST +EXTRA_PROGRAMS = \ + src/client/linux/linux_client_unittest_shlib + check_PROGRAMS += \ src/client/linux/linux_client_unittest @@ -321,7 +330,7 @@ src_client_linux_linux_dumper_unittest_helper_CXXFLAGS=$(PTHREAD_CFLAGS) src_client_linux_linux_dumper_unittest_helper_LDFLAGS=$(PTHREAD_CFLAGS) src_client_linux_linux_dumper_unittest_helper_CC=$(PTHREAD_CC) -src_client_linux_linux_client_unittest_SOURCES = \ +src_client_linux_linux_client_unittest_shlib_SOURCES = \ src/client/linux/handler/exception_handler_unittest.cc \ src/client/linux/minidump_writer/directory_reader_unittest.cc \ src/client/linux/minidump_writer/line_reader_unittest.cc \ @@ -343,17 +352,20 @@ src_client_linux_linux_client_unittest_SOURCES = \ src/processor/minidump.cc \ src/processor/pathname_stripper.cc if ANDROID_HOST -src_client_linux_linux_client_unittest_SOURCES += \ +src_client_linux_linux_client_unittest_shlib_SOURCES += \ src/common/android/breakpad_getcontext.S endif -src_client_linux_linux_client_unittest_CPPFLAGS = \ +src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/testing/include \ -I$(top_srcdir)/src/testing/gtest/include \ -I$(top_srcdir)/src/testing/gtest \ -I$(top_srcdir)/src/testing -src_client_linux_linux_client_unittest_LDADD = \ +src_client_linux_linux_client_unittest_shlib_LDFLAGS = \ + -shared \ + -Wl,-h,linux_client_unittest_shlib +src_client_linux_linux_client_unittest_shlib_LDADD = \ src/client/linux/handler/exception_handler.o \ src/client/linux/handler/minidump_descriptor.o \ src/client/linux/log/log.o \ @@ -373,17 +385,27 @@ src_client_linux_linux_client_unittest_LDADD = \ src/common/string_conversion.o \ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) if ANDROID_HOST -src_client_linux_linux_client_unittest_SOURCES += \ +src_client_linux_linux_client_unittest_shlib_SOURCES += \ src/common/android/breakpad_getcontext_unittest.cc -src_client_linux_linux_client_unittest_LDFLAGS = \ +src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ -llog endif -src_client_linux_linux_client_unittest_DEPENDENCIES = \ +src_client_linux_linux_client_unittest_shlib_DEPENDENCIES = \ src/client/linux/linux_dumper_unittest_helper \ src/client/linux/libbreakpad_client.a \ src/libbreakpad.a +src_client_linux_linux_client_unittest_SOURCES = +src_client_linux_linux_client_unittest_LDFLAGS = \ + -Wl,-rpath,'$$ORIGIN' + +src_client_linux_linux_client_unittest_LDADD = \ + src/client/linux/linux_client_unittest_shlib + +src_client_linux_linux_client_unittest_DEPENDENCIES = \ + src/client/linux/linux_client_unittest_shlib + if !DISABLE_TOOLS src_tools_linux_core2md_core2md_SOURCES = \ src/tools/linux/core2md/core2md.cc \ |