diff options
| author | DJ Delorie <dj@redhat.com> | 2015-08-06 18:35:26 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2015-08-06 23:55:06 -0400 |
| commit | 016a3251631341bf4d8fe50966d2b70f8ea69e96 (patch) | |
| tree | 1ff0c40495ed3f51ac0ee574b3c48b87deb7e5e9 /gdb/Makefile.in | |
| parent | 308d9764e1ce02c31882e6d99bbaebe63c7fe830 (diff) | |
| download | gdb-016a3251631341bf4d8fe50966d2b70f8ea69e96.zip gdb-016a3251631341bf4d8fe50966d2b70f8ea69e96.tar.gz gdb-016a3251631341bf4d8fe50966d2b70f8ea69e96.tar.bz2 | |
Yaakov Selkowitz: fixes for in-tree libiconv
* Makefile.def (libiconv): Define bootstrap=true.
Mark pdf/html/info as missing.
(configure-gcc): Depend on all-libiconv.
(all-gcc): Ditto.
(configure-libcpp): Ditto.
(all-libcpp): Ditto.
(configure-intl): Ditto.
(all-intl): Ditto.
* Makefile.in: Regenerate.
binutils/
* configure: Regenerate.
gdb/
* Makefile.in (LIBICONV): Define.
(CLIBS): Add LIBICONV.
* acinclude.m4: Use config/iconv.m4 instead of custom AM_ICONV.
* configure: Regenerate.
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 4080ba4..fdbfb42 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -194,6 +194,9 @@ INTL = @LIBINTL@ INTL_DEPS = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ +# Where is the ICONV library? This will be empty if in libc or not available. +LIBICONV = @LIBICONV@ + # Did the user give us a --with-gdb-datadir option? GDB_DATADIR = @GDB_DATADIR@ @@ -594,7 +597,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBD $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) \ @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \ $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \ - $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) + $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) |