From: Pedro Alves <palves@redhat.com>
Date: Fri, 10 Feb 2012 13:57:59 +0000 (+0000)
Subject: 2012-02-10  Pedro Alves  <palves@redhat.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12cd34f3ad4fe3d0fd15d0c1dafe9d01c1bfa64c;p=binutils-gdb.git

2012-02-10  Pedro Alves  <palves@redhat.com>

	* configure.ac (HAVE_ELF test): Put the old CFLAGS at the end of
	the test CFLAGS.
	* configure: Regenerate.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ff74c510abd..9cf37d566a2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-10  Pedro Alves  <palves@redhat.com>
+
+	* configure.ac (HAVE_ELF test): Put the old CFLAGS at the end of
+	the test CFLAGS.
+	* configure: Regenerate.
+
 2012-02-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* linespec.c (decode_line_internal): Fix comment correctness.
diff --git a/gdb/configure b/gdb/configure
index 11c044caad4..2566410c10c 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -15320,7 +15320,10 @@ esac
 OLD_CFLAGS=$CFLAGS
 OLD_LDFLAGS=$LDFLAGS
 OLD_LIBS=$LIBS
-CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd"
+# Put the old CFLAGS/LDFLAGS last, in case the user's (C|LD)FLAGS
+# points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
+# always want our bfd.
+CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
 LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
 intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
 # -ldl is provided by bfd/Makfile.am (LIBDL) <PLUGINS>.
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 36da4630811..1b11adb066b 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1908,7 +1908,10 @@ AC_SUBST(WIN32LIBS)
 OLD_CFLAGS=$CFLAGS
 OLD_LDFLAGS=$LDFLAGS
 OLD_LIBS=$LIBS
-CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd"
+# Put the old CFLAGS/LDFLAGS last, in case the user's (C|LD)FLAGS
+# points somewhere with bfd, with -I/foo/lib and -L/foo/lib.  We
+# always want our bfd.
+CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
 LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
 intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
 # -ldl is provided by bfd/Makfile.am (LIBDL) <PLUGINS>.