From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 23 Mar 2010 21:31:29 +0000 (+0000)
Subject: gdb: fix building with system readline
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64e3cf3d4f121e456a09c3998c4aa6d739e61f8a;p=binutils-gdb.git

gdb: fix building with system readline

Building gdb with --enable-targets=all and --with-system-readline hits a
failure in a few targets all related to the inclusion of some opcodes
headers.  The usage of the bundled readline results in an -I to the top
srcdir, but if that isn't used, then there is no such -I path.  A few gdb
targets use this implicitly to include opcodes/ source header files.  So
make sure there is always an explicit -I path to the opcodes/ directory.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb022786eb2..960d4301527 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-23  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (OPCODES_CFLAGS): Add -I$(OPCODES_SRC)/..
+
 2010-03-22  Stan Shebs  <stan@codesourcery.com>
 
 	* value.c (value_static_field): Be lazy about the field's value.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 9a02ba13452..72b546dfabc 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -309,7 +309,8 @@ OPCODES = $(OPCODES_DIR)/libopcodes.a
 # Where are the other opcode tables which only have header file
 # versions?
 OP_INCLUDE = $(INCLUDE_DIR)/opcode
-OPCODES_CFLAGS = -I$(OP_INCLUDE)
+# Some source files like to use #include "opcodes/file.h"
+OPCODES_CFLAGS = -I$(OP_INCLUDE) -I$(OPCODES_SRC)/..
 
 # The simulator is usually nonexistent; targets that include one
 # should set this to list all the .o or .a files to be linked in.