aboutsummaryrefslogtreecommitdiff
path: root/Makefile.def
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2020-03-12 13:32:15 -0600
committerTom Tromey <tromey@adacore.com>2020-03-12 13:32:15 -0600
commit9a665d62266e75f0519f3a663784c458885b5c63 (patch)
tree61b663275210c20686430c53fe7864ce6ceb19aa /Makefile.def
parent227031b2bf03e7735601845d6c420995740c8fca (diff)
downloadgdb-9a665d62266e75f0519f3a663784c458885b5c63.zip
gdb-9a665d62266e75f0519f3a663784c458885b5c63.tar.gz
gdb-9a665d62266e75f0519f3a663784c458885b5c63.tar.bz2
Fix gdbserver build when intl already built
gdbserver uses gdb's alloc.c, and this in turn can include headers from intl via gdbsupport/gdb_locale.h. This can cause build failures in some situations, for example if you build gdb and gdbserver on mingw. This patch restores the gdbsupport dependency on intl, and changes gdbserver to use ZW_GNU_GETTEXT_SISTER_DIR. This fixes this build problem. ChangeLog 2020-03-12 Tom Tromey <tom@tromey.com> * Makefile.in: Rebuild. * Makefile.def (gdbsupport): Depend on intl. gdbserver/ChangeLog 2020-03-12 Tom Tromey <tom@tromey.com> * config.in, configure: Rebuild. * configure.ac: Call ZW_GNU_GETTEXT_SISTER_DIR. * acinclude.m4: Include gettext-sister.m4. * Makefile.in (top_builddir, INTL, INTL_DEPS, INTL_CFLAGS): New variables. (INCLUDE_CFLAGS): Add INTL_CFLAGS. (gdbserver$(EXEEXT), gdbreplay$(EXEEXT)): Use INTL_DEPS, INTL.
Diffstat (limited to 'Makefile.def')
-rw-r--r--Makefile.def2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.def b/Makefile.def
index 2fe8204..7a27220 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -423,8 +423,10 @@ dependencies = { module=all-libgui; on=all-itcl; };
dependencies = { module=configure-gdbsupport; on=configure-bfd; };
dependencies = { module=configure-gdbsupport; on=configure-gnulib; };
+dependencies = { module=configure-gdbsupport; on=configure-intl; };
dependencies = { module=all-gdbsupport; on=all-bfd; };
dependencies = { module=all-gdbsupport; on=all-gnulib; };
+dependencies = { module=all-gdbsupport; on=all-intl; };
// Host modules specific to binutils.
dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; };