diff options
| author | thestig@chromium.org <thestig@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-04-19 18:31:37 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-04-19 18:31:37 +0000 |
| commit | dff2d3e632c10122da74c9312ee151a0581c2122 (patch) | |
| tree | fcc98d34c7b9ac656f48b31e4077373bc0fa8acc /Makefile.in | |
| parent | Fix file descriptor leak in GetThreadInfoByIndex (diff) | |
| download | breakpad-dff2d3e632c10122da74c9312ee151a0581c2122.tar.xz | |
Make Breakpad build with DSO linking on newer versions of Fedora/Ubuntu.
BUG=444
TEST=compiles
Kudos to pkwarren at geeee mail.com for coming up with this 5 months ago.
Review URL: https://breakpad.appspot.com/382001
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@955 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index bc9ef028..9c65ee50 100644 --- a/Makefile.in +++ b/Makefile.in @@ -980,11 +980,7 @@ am__src_tools_linux_symupload_minidump_upload_SOURCES_DIST = \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/minidump_upload.$(OBJEXT) src_tools_linux_symupload_minidump_upload_OBJECTS = \ $(am_src_tools_linux_symupload_minidump_upload_OBJECTS) -src_tools_linux_symupload_minidump_upload_LDADD = $(LDADD) -src_tools_linux_symupload_minidump_upload_LINK = $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(src_tools_linux_symupload_minidump_upload_LDFLAGS) \ - $(LDFLAGS) -o $@ +src_tools_linux_symupload_minidump_upload_DEPENDENCIES = am__src_tools_linux_symupload_sym_upload_SOURCES_DIST = \ src/common/linux/http_upload.cc \ src/tools/linux/symupload/sym_upload.cc @@ -992,10 +988,7 @@ am__src_tools_linux_symupload_sym_upload_SOURCES_DIST = \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/sym_upload.$(OBJEXT) src_tools_linux_symupload_sym_upload_OBJECTS = \ $(am_src_tools_linux_symupload_sym_upload_OBJECTS) -src_tools_linux_symupload_sym_upload_LDADD = $(LDADD) -src_tools_linux_symupload_sym_upload_LINK = $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(src_tools_linux_symupload_sym_upload_LDFLAGS) \ - $(LDFLAGS) -o $@ +src_tools_linux_symupload_sym_upload_DEPENDENCIES = SCRIPTS = $(noinst_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp @@ -1457,12 +1450,12 @@ TESTS_ENVIRONMENT = @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/linux/http_upload.cc \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/minidump_upload.cc -@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@src_tools_linux_symupload_minidump_upload_LDFLAGS = -ldl +@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@src_tools_linux_symupload_minidump_upload_LDADD = -ldl @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@src_tools_linux_symupload_sym_upload_SOURCES = \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/linux/http_upload.cc \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/sym_upload.cc -@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@src_tools_linux_symupload_sym_upload_LDFLAGS = -ldl +@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@src_tools_linux_symupload_sym_upload_LDADD = -ldl @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@src_common_dumper_unittest_SOURCES = \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/byte_cursor_unittest.cc \ @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/dwarf_cfi_to_module.cc \ @@ -3091,13 +3084,13 @@ src/tools/linux/symupload/minidump_upload.$(OBJEXT): \ src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) @rm -f src/tools/linux/symupload/minidump_upload$(EXEEXT) - $(src_tools_linux_symupload_minidump_upload_LINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS) + $(CXXLINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS) src/tools/linux/symupload/sym_upload.$(OBJEXT): \ src/tools/linux/symupload/$(am__dirstamp) \ src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) @rm -f src/tools/linux/symupload/sym_upload$(EXEEXT) - $(src_tools_linux_symupload_sym_upload_LINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS) + $(CXXLINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) |