diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rwxr-xr-x | gdb/configure | 5 | ||||
| -rw-r--r-- | gdb/configure.ac | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ff74c51..9cf37d5 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 11c044c..2566410 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 36da463..1b11adb 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>. |