From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 9 Apr 2015 11:43:57 +0000 (-0700)
Subject: Replace $zlibdir with $ZLIBDIR in LDFLAGS
X-Git-Tag: users/hjl/linux/release/2.25.51.0.2~2^2~16^2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a2d4533e2b9cc9c069d47071013cb30f1e0fc7e;p=thirdparty%2Fbinutils-gdb.git

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 --git a/gdb/ChangeLog b/gdb/ChangeLog
index 73a32a9e0ce..84d437f5aab 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 98ae85f551a..845e65f04b4 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 f83515751e8..2baf6dd6ad3 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