From e39b33d6bee578eceb27482fbce55e5c5516821b Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 8 Sep 2020 14:12:28 +0200 Subject: [PATCH] debuginfod: Fix BUILD_STATIC build. The BUILD_STATIC build, as used by the coverage setup, was broken for debuginfod because the DUMMY_LIBDEBUGINFOD case was mixed up. It should include libcurl_LIBS when NOT doing a dummy build. Signed-off-by: Mark Wielaard --- debuginfod/ChangeLog | 5 +++++ debuginfod/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index d9efa81ef..a8e0ac5ec 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,8 @@ +2020-09-08 Mark Wielaard + + * Makefile.am (BUILD_STATIC): Include libcurl_LIBS in libdebuginfod + when NOT DUMMY_LIBDEBUGINFOD. + 2020-09-16 Mark Wielaard * debuginfod-find.c: Fix license block comment. diff --git a/debuginfod/Makefile.am b/debuginfod/Makefile.am index 2e8a343ca..01985600e 100644 --- a/debuginfod/Makefile.am +++ b/debuginfod/Makefile.am @@ -46,9 +46,9 @@ libasm = ../libasm/libasm.a libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread libelf = ../libelf/libelf.a -lz if DUMMY_LIBDEBUGINFOD -libdebuginfod = ./libdebuginfod.a $(libcurl_LIBS) -else libdebuginfod = ./libdebuginfod.a +else +libdebuginfod = ./libdebuginfod.a $(libcurl_LIBS) endif else libasm = ../libasm/libasm.so -- 2.47.2