This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Replace $zlibdir with $ZLIBDIR in LDFLAGS
- From: H.J.Lu <hjl at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 9 Apr 2015 11:46:00 -0000
- Subject: [binutils-gdb] Replace $zlibdir with $ZLIBDIR in LDFLAGS
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5a2d4533e2b9cc9c069d47071013cb30f1e0fc7e
commit 5a2d4533e2b9cc9c069d47071013cb30f1e0fc7e
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Apr 9 04:43:57 2015 -0700
Replace $zlibdir with $ZLIBDIR in LDFLAGS
* acinclude.m4: (GDB_AC_CHECK_BFD): Set ZLIBDIR with $zlibdir.
Replace $zlibdir with $ZLIBDIR in LDFLAGS.
* configure: Regenerated.
Diff:
---
gdb/ChangeLog | 6 ++++++
gdb/acinclude.m4 | 3 ++-
gdb/configure | 6 ++++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 73a32a9..84d437f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-09 H.J. Lu <hongjiu.lu@intel.com>
+
+ * acinclude.m4: (GDB_AC_CHECK_BFD): Set ZLIBDIR with $zlibdir.
+ Replace $zlibdir with $ZLIBDIR in LDFLAGS.
+ * configure: Regenerated.
+
2015-04-09 Pedro Alves <palves@redhat.com>
* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add strtok_r.
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 98ae85f..845e65f 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -465,7 +465,8 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
# 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 $zlibdir $LDFLAGS"
+ ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'`
+ LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS"
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
LIBS="-lbfd -liberty -lz $intl $LIBS"
AC_CACHE_CHECK([$1], [$2],
diff --git a/gdb/configure b/gdb/configure
index f835157..2baf6dd 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -13526,7 +13526,8 @@ esac
# 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 $zlibdir $LDFLAGS"
+ ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'`
+ LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS"
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
LIBS="-lbfd -liberty -lz $intl $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5
@@ -13636,7 +13637,8 @@ fi
# 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 $zlibdir $LDFLAGS"
+ ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'`
+ LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS"
intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
LIBS="-lbfd -liberty -lz $intl $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mach-O support in BFD" >&5