diff options
| author | Pedro Alves <palves@redhat.com> | 2013-07-03 13:25:45 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2013-07-03 13:25:45 +0000 |
| commit | 528686b1417c64b9003e3a208aecf7a3393c9298 (patch) | |
| tree | 97a38100e776e8f5036b825cdf385d66c55ec0e6 /gdb/Makefile.in | |
| parent | 02bbcd0bf94ef12ef1cce3d20c89089443a02f70 (diff) | |
| download | gdb-528686b1417c64b9003e3a208aecf7a3393c9298.tar.gz | |
On mainline/development, also link GDBserver with -lmcheck.
This factors --enable-libmcheck related bits from GDB's configure.ac
and makes GDBserver use them too. Specifically, the 'development'
global is moved to a separate script to it can be sourced by both GDB
and GDBserver, and the --enable-libmcheck/--disable-libmcheck bits
proper are moved to a new m4 file.
I started out by defining 'development' in the m4 file, but in the end
decided against it, as a separate script has the advantage that
changing it in release branches does not require regenerating
configure, unlike today.
I had also started out by making the new GDB_AC_LIBMCHECK itself
handle the yes/no default fallback depending on release/developement,
but since I had split out 'development' to a separate script, and, GDB
needs the python checks anyway (hence we'd need to do the python
checks in gdb's configure.ac, and pass in a 'default lmcheck yes/no'
parameter to GDB_AC_LIBMCHECK anyway), I ended up keeping
GDB_AC_LIBMCHECK isolated from the 'development' global. IOW, it's
the caller's business to handle it.
Tested on x86_64 Fedora 17. Built GDB and GDBserver with and without
--enable-libmcheck, and observed --enable-libmcheck overrides the
disablement of -lmcheck caused by python supporting threads, and that
GDBserver links with -lmcheck when expected. Also observed that
changing the 'development' global, and issuing "make" triggers a
relink, and '-lmcheck' is included or not from the link accordingly.
gdb/
2013-07-03 Pedro Alves <palves@redhat.com>
* Makefile.in (config.status): Depend on development.sh.
(aclocal_m4_deps): Add libmcheck.m4.
* acinclude.m4: Include libmcheck.m4.
* configure.ac: Source development.sh instead of setting
'development' here. --enable-libmcheck/--disable-libmcheck code
factored out to GDB_AC_LIBMCHECK. Run it.
* development.sh: New file.
* libmcheck.m4: New file.
* configure: Regenerate.
gdb/gdbserver/
2013-07-03 Pedro Alves <palves@redhat.com>
* Makefile.in (config.status): Depend on development.sh.
* acinclude.m4: Include libmcheck.m4.
* configure: Regenerate.
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index aca5dbfc88d..4694adcc587 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1348,7 +1348,7 @@ stamp-h: $(srcdir)/config.in config.status CONFIG_LINKS= \ $(SHELL) config.status -config.status: $(srcdir)/configure configure.tgt configure.host +config.status: $(srcdir)/configure configure.tgt configure.host development.sh $(SHELL) config.status --recheck ACLOCAL = aclocal @@ -1358,6 +1358,7 @@ ACLOCAL_AMFLAGS = -I ../config aclocal_m4_deps = \ configure.ac \ acx_configure_dir.m4 \ + libmcheck.m4 \ ../bfd/bfd.m4 \ ../config/acinclude.m4 \ ../config/plugins.m4 \ |