From d138725a62c3fd04cd1b34352d778d6682c73694 Mon Sep 17 00:00:00 2001 From: Aaron Merey Date: Tue, 18 Aug 2020 18:02:26 -0400 Subject: [PATCH] gdb/Makefile.in: Add DEBUGINFOD_CFLAGS, DEBUGINFOD_LIBS variables. Introduce Makefile variables DEBUGINFOD_CFLAGS and DEBUGINFOD_LIBS that map to the configuration variables of the same names. Replace @DEBUGINFOD_LIBS@ with $(DEBUGINFOD_LIBS) in the definition of CLIBS in order to conform to the usage of other *_LIBS variables in Makefile.in. Add DEBUGINFOD_CFLAGS to INTERNAL_CFLAGS_BASE. This fixes an issue where GDB would fail to find debuginfod.h if it was not installed in a default location searched by the compiler. gdb/ChangeLog: * Makefile.in (DEBUGINFOD_CFLAGS, DEBUGINFOD_LIBS): New variables. (INTERNAL_CFLAGS_BASE): Add DEBUGINFOD_CFLAGS. (CLIBS): Add DEBUGINFOD_LIBS. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3f681e19e5a..ddb35e9af78 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-08-18 Aaron Merey + + * Makefile.in (DEBUGINFOD_CFLAGS, DEBUGINFOD_LIBS): New variables. + (INTERNAL_CFLAGS_BASE): Add DEBUGINFOD_CFLAGS. + (CLIBS): Add DEBUGINFOD_LIBS. + 2020-08-17 Sergei Trofimovich * ia64-linux-nat.c: Include "gdbarch.h" to declare used diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 67dc9daf16a..66abac4b15a 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -214,6 +214,9 @@ GDB_WERROR_CFLAGS = $(WERROR_CFLAGS) PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ +DEBUGINFOD_CFLAGS = @DEBUGINFOD_CFLAGS@ +DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ + RDYNAMIC = @RDYNAMIC@ # Where is the INTL library? Typically in ../intl. @@ -598,7 +601,8 @@ INTERNAL_CFLAGS_BASE = \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ $(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(ENABLE_CFLAGS) \ - $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) $(TOP_CFLAGS) $(PTHREAD_CFLAGS) + $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) $(TOP_CFLAGS) $(PTHREAD_CFLAGS) \ + $(DEBUGINFOD_CFLAGS) INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) @@ -624,7 +628,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) \ $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \ $(WIN32LIBS) $(LIBGNU) $(LIBICONV) \ $(LIBMPFR) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ - @DEBUGINFOD_LIBS@ + $(DEBUGINFOD_LIBS) CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \ $(LIBSUPPORT) -- 2.30.2