diff options
author | Tom Tromey <tom@tromey.com> | 2020-02-14 14:34:20 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2020-02-14 14:34:20 -0700 |
commit | 1a627e7e6c61e97951932e3a9c5fb706efe3ef3e (patch) | |
tree | 14a1dac984522ec23576065d34a037ab8f7d9b02 /gdbserver/configure.ac | |
parent | a4a38eb437382fbf2b2c6788fe35dd3340f9664a (diff) | |
download | gdb-1a627e7e6c61e97951932e3a9c5fb706efe3ef3e.zip gdb-1a627e7e6c61e97951932e3a9c5fb706efe3ef3e.tar.gz gdb-1a627e7e6c61e97951932e3a9c5fb706efe3ef3e.tar.bz2 |
Change gdbserver to use existing gnulib and libiberty
This changes gdbserver so that it no longer builds its own gnulib and
libiberty. Instead, it now relies on the ones that were already built
at the top level.
gdbsupport is still built specially for gdbserver. This is more
complicated and will be tackled in a subsequent patch.
ChangeLog
2020-02-14 Tom Tromey <tom@tromey.com>
* Makefile.in: Rebuild.
* Makefile.def: Make gdbserver require gnulib and libiberty.
gdbserver/ChangeLog
2020-02-14 Tom Tromey <tom@tromey.com>
* acinclude.m4: Don't include acx_configure_dir.m4.
* Makefile.in (LIBIBERTY_BUILDDIR, GNULIB_BUILDDIR): Update.
(SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): Remove.
(all, install-only, uninstall, clean-info, clean)
(maintainer-clean): Don't recurse.
(subdir_do, all-lib): Remove.
($(LIBGNU) $(LIBIBERTY) $(GNULIB_H)): Remove rule.
(GNULIB_H): Remove.
(generated_files): Update.
($(GNULIB_BUILDDIR)/Makefile): Remove rule.
* configure: Rebuild.
* configure.ac: Don't configure gnulib or libiberty.
(GNULIB): Update.
gdbsupport/ChangeLog
2020-02-14 Tom Tromey <tom@tromey.com>
* common-defs.h: Change path to gnulib/config.h.
Change-Id: I469cbbf5db2ab37109c058e9e3a1e4f4dabdfc98
Diffstat (limited to 'gdbserver/configure.ac')
-rw-r--r-- | gdbserver/configure.ac | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index 0da2bfa..be2284b 100644 --- a/gdbserver/configure.ac +++ b/gdbserver/configure.ac @@ -69,22 +69,6 @@ AC_CONFIG_COMMANDS([gdbdepdir],[ ZW_PROG_COMPILER_DEPENDENCIES([CC]) -gnulib_extra_configure_args= -# If large-file support is disabled, make sure gnulib does the same. -if test "$enable_largefile" = no; then -gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile" -fi - -# Configure gnulib. We can't use AC_CONFIG_SUBDIRS as that'd expect -# to find the the source subdir to be configured directly under -# gdbserver/. We need to build gnulib under some other directory not -# "gnulib", to avoid the problem of both GDB and GDBserver wanting to -# build it in the same directory, when building in the source dir. -ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"], - ["$gnulib_extra_configure_args"]) - -ACX_CONFIGURE_DIR(["../libiberty"], ["build-libiberty-gdbserver"]) - AC_CHECK_HEADERS(termios.h sys/reg.h string.h dnl sys/procfs.h linux/elf.h dnl fcntl.h signal.h sys/file.h dnl @@ -432,7 +416,7 @@ AC_SUBST(srv_xmlfiles) AC_SUBST(IPA_DEPFILES) AC_SUBST(extra_libraries) -GNULIB=build-gnulib-gdbserver/import +GNULIB=../gnulib/import GNULIB_STDINT_H= if test x"$STDINT_H" != x; then |