diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-03-31 03:53:41 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-03-31 03:53:55 -0700 |
| commit | 0ee42ecde7aadb3e68ae5b944f7b1b6a859ebcfd (patch) | |
| tree | d340d7c5a7897eef99004fa960d0086f1801ce8a /binutils/Makefile.am | |
| parent | b38f7f340bf021f9ad017cc88beddb9b0eaae06b (diff) | |
| download | gdb-0ee42ecde7aadb3e68ae5b944f7b1b6a859ebcfd.zip gdb-0ee42ecde7aadb3e68ae5b944f7b1b6a859ebcfd.tar.gz gdb-0ee42ecde7aadb3e68ae5b944f7b1b6a859ebcfd.tar.bz2 | |
Add --with-system-zlib in binutils
This patch adds --with-system-zlib and remove --with-zlib in binutils.
* Makefile.am (ZLIB): New.
(ZLIBINC): Likewise.
(AM_CFLAGS): Add $(ZLIBINC).
(readelf_LDADD): Add $(ZLIB).
* configure.ac (AM_ZLIB): Removed.
(zlibdir): New. AC_SUBST.
(zlibinc): Likewise.
Add --with-system-zlib.
* readelf.c: Don't check HAVE_ZLIB_H to include <zlib.h>.
(uncompress_section_contents): Don't check HAVE_ZLIB_H.
* Makefile.in: Regenerated.
* config.in: Likewise.
* configure: Likewise.
Diffstat (limited to 'binutils/Makefile.am')
| -rw-r--r-- | binutils/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 51dd8e4..b55dbd6 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -40,9 +40,15 @@ LEXLIB = @LEXLIB@ am__skiplex = am__skipyacc = +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIB = @zlibdir@ -lz +ZLIBINC = @zlibinc@ + WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ -AM_CFLAGS = $(WARN_CFLAGS) +AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) LIBICONV = @LIBICONV@ # these two are almost the same program @@ -230,7 +236,7 @@ objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS) strings_SOURCES = strings.c $(BULIBS) readelf_SOURCES = readelf.c version.c unwind-ia64.c dwarf.c $(ELFLIBS) -readelf_LDADD = $(LIBINTL) $(LIBIBERTY) +readelf_LDADD = $(LIBINTL) $(LIBIBERTY) $(ZLIB) elfedit_SOURCES = elfedit.c version.c $(ELFLIBS) elfedit_LDADD = $(LIBINTL) $(LIBIBERTY) |