From 2481554490026ab9386ebc654343132d06194ce5 Mon Sep 17 00:00:00 2001 From: Ian McKellar Date: Tue, 16 Jan 2024 17:21:10 +0000 Subject: [PATCH] Regenerate Makefile.in for zstd dependency The version of Makefile.in that landed in https://crrev.com/c/4722191 had a Makefile.in that was generated from a previous version of Makefile.am where the libzstd dependency wasn't optional. That's causing some problems (see: https://crrev.com/c/5193965) and is a simple mistake. I generated this CL by simply running `automake`, so it simply makes the checked in generated Makefile.in based on the checked in source Makefile.am Change-Id: Iabb4a99bfac3f5ef6067a140bd373c9fb894878a Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5200626 Reviewed-by: Mike Frysinger --- Makefile.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0c47bf87..7637800c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2691,11 +2691,13 @@ src_tools_linux_dump_syms_dump_syms_SOURCES = \ src/tools/linux/dump_syms/dump_syms.cc src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \ - $(RUSTC_DEMANGLE_CFLAGS) + $(RUSTC_DEMANGLE_CFLAGS) \ + $(ZSTD_CFLAGS) src_tools_linux_dump_syms_dump_syms_LDADD = \ $(RUSTC_DEMANGLE_LIBS) \ - -lz -lzstd + $(ZSTD_CFLAGS) \ + -lz src_tools_linux_md2core_minidump_2_core_SOURCES = \ src/common/linux/memory_mapped_file.cc \ @@ -2822,13 +2824,15 @@ src_common_dumper_unittest_SOURCES = \ src_common_dumper_unittest_CPPFLAGS = \ $(AM_CPPFLAGS) $(TEST_CFLAGS) \ $(RUSTC_DEMANGLE_CFLAGS) \ - $(PTHREAD_CFLAGS) + $(PTHREAD_CFLAGS) \ + $(ZSTD_CFLAGS) src_common_dumper_unittest_LDADD = \ $(TEST_LIBS) \ $(RUSTC_DEMANGLE_LIBS) \ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \ - -lz -lzstd + $(ZSTD_LIBS) \ + -lz src_common_mac_macho_reader_unittest_SOURCES = \ src/common/dwarf_cfi_to_module.cc \