Don't include libdisasm.a in libbreakpad.a

libbreakpad.a pointlessly contains libdisasm.a

This looks like a left-over from when libtool was used

Since this has no useful effect (as the linker doesn't recursively search
archive members which aren't objects), anything which requires the objects in
libdisasm.a must already be linking with it, so simply remove it.

BUG=https://code.google.com/p/google-breakpad/issues/detail?id=484

Review URL: https://codereview.chromium.org/1399003002 .
This commit is contained in:
Mike Frysinger 2015-11-11 01:17:45 -05:00
parent ac2a3e466f
commit 2d1b97a1ff
2 changed files with 1 additions and 4 deletions

View File

@ -273,8 +273,6 @@ src_libbreakpad_a_SOURCES = \
src/processor/tokenize.cc \ src/processor/tokenize.cc \
src/processor/tokenize.h src/processor/tokenize.h
src_libbreakpad_a_LIBADD = src/third_party/libdisasm/libdisasm.a
src_third_party_libdisasm_libdisasm_a_SOURCES = \ src_third_party_libdisasm_libdisasm_a_SOURCES = \
src/third_party/libdisasm/ia32_implicit.c \ src/third_party/libdisasm/ia32_implicit.c \
src/third_party/libdisasm/ia32_implicit.h \ src/third_party/libdisasm/ia32_implicit.h \

View File

@ -333,7 +333,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
src_client_linux_libbreakpad_client_a_OBJECTS = \ src_client_linux_libbreakpad_client_a_OBJECTS = \
$(am_src_client_linux_libbreakpad_client_a_OBJECTS) $(am_src_client_linux_libbreakpad_client_a_OBJECTS)
src_libbreakpad_a_AR = $(AR) $(ARFLAGS) src_libbreakpad_a_AR = $(AR) $(ARFLAGS)
@DISABLE_PROCESSOR_FALSE@src_libbreakpad_a_DEPENDENCIES = src/third_party/libdisasm/libdisasm.a src_libbreakpad_a_LIBADD =
am__src_libbreakpad_a_SOURCES_DIST = \ am__src_libbreakpad_a_SOURCES_DIST = \
src/google_breakpad/common/breakpad_types.h \ src/google_breakpad/common/breakpad_types.h \
src/google_breakpad/common/minidump_format.h \ src/google_breakpad/common/minidump_format.h \
@ -2194,7 +2194,6 @@ lib_LIBRARIES = $(am__append_5) $(am__append_8)
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.cc \ @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.cc \
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.h @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.h
@DISABLE_PROCESSOR_FALSE@src_libbreakpad_a_LIBADD = src/third_party/libdisasm/libdisasm.a
@DISABLE_PROCESSOR_FALSE@src_third_party_libdisasm_libdisasm_a_SOURCES = \ @DISABLE_PROCESSOR_FALSE@src_third_party_libdisasm_libdisasm_a_SOURCES = \
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/ia32_implicit.c \ @DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/ia32_implicit.c \
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/ia32_implicit.h \ @DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/ia32_implicit.h \