diff options
| author | Tom Tromey <tom@tromey.com> | 2020-03-12 13:32:15 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2020-03-12 13:32:15 -0600 |
| commit | 9a665d62266e75f0519f3a663784c458885b5c63 (patch) | |
| tree | 61b663275210c20686430c53fe7864ce6ceb19aa /gdbserver/Makefile.in | |
| parent | 227031b2bf03e7735601845d6c420995740c8fca (diff) | |
| download | fsf-binutils-gdb-9a665d62266e75f0519f3a663784c458885b5c63.zip fsf-binutils-gdb-9a665d62266e75f0519f3a663784c458885b5c63.tar.gz fsf-binutils-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 'gdbserver/Makefile.in')
| -rw-r--r-- | gdbserver/Makefile.in | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index cc1eb80..d6b7938 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -75,6 +75,8 @@ abs_top_srcdir = @abs_top_srcdir@ abs_srcdir = @abs_srcdir@ VPATH = @srcdir@ +top_builddir = . + include $(srcdir)/../gdb/silent-rules.mk # Note that these are overridden by GNU make-specific code below if @@ -109,6 +111,11 @@ GNULIB_BUILDDIR = ../gnulib LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import +# Where is the INTL library? Typically in ../intl. +INTL = @LIBINTL@ +INTL_DEPS = @LIBINTL_DEP@ +INTL_CFLAGS = @INCINTL@ + INCSUPPORT = -I$(srcdir)/.. -I.. # All the includes used for CFLAGS and for lint. @@ -122,7 +129,8 @@ INCSUPPORT = -I$(srcdir)/.. -I.. # INCLUDE_CFLAGS = -I. -I${srcdir} \ -I$(srcdir)/../gdb/regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \ - -I$(srcdir)/../gdb $(INCGNU) $(INCSUPPORT) + -I$(srcdir)/../gdb $(INCGNU) $(INCSUPPORT) \ + $(INTL_CFLAGS) # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS # from the config/ directory. @@ -403,17 +411,19 @@ html: install-html: clean-info: -gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) +gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ + $(INTL_DEPS) $(SILENCE) rm -f gdbserver$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ -o gdbserver$(EXEEXT) $(OBS) $(LIBGNU) $(LIBIBERTY) \ - $(GDBSERVER_LIBS) $(XM_CLIBS) + $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) -gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) +gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ + $(INTL_DEPS) $(SILENCE) rm -f gdbreplay$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) $(LIBGNU) \ - $(LIBIBERTY) + $(LIBIBERTY) $(INTL) IPA_OBJS = \ alloc-ipa.o \ |