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 ff74c510abd465878587360cb04ade0024d88180..9cf37d566a2f02205b115f9c21bd052a3c247c48 100644 (file)
--- 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 11c044caad455723e055ddd47a2050c20c0e29c2..2566410c10caa8545835aaaeaa1fc878f867cbbe 100755 (executable)
--- 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 36da46308113e13b0cf562dcc7c10ed132ac8b05..1b11adb066be858fabf09ab5e7826289982d000e 100644 (file)
--- 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>.