diff options
| author | Tom Tromey <tom@tromey.com> | 2019-10-19 15:42:34 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-10-21 07:45:30 -0600 |
| commit | a0a461e5b45f6fd9eb81774ad61e55b4917d4305 (patch) | |
| tree | 6d563aa9b1cfc93576519b685f05a5f751ecfa45 /gdb/Makefile.in | |
| parent | 94cb3754118669d46c8ad87c986d8d9c59fac65a (diff) | |
| download | gdb-a0a461e5b45f6fd9eb81774ad61e55b4917d4305.zip gdb-a0a461e5b45f6fd9eb81774ad61e55b4917d4305.tar.gz gdb-a0a461e5b45f6fd9eb81774ad61e55b4917d4305.tar.bz2 | |
Fix creation of nm.h when configure is changed
My earlier patch -- commit c5adaa192 ("Fix creation of stamp-h by
gdb's configure script") -- broke the creation of nm.h. In
particular, configure removes nm.h, so if you touch configure and
rebuild, nothing will re-create the link, breaking the build.
This patch fixes the bug, and also updates configure.ac to use
AC_CONFIG_LINKS, rather than the obsolete AC_LINK_FILES.
Finally, I noticed that gcore is in generated_files in the
Makefile.in. I think this is incorrect, as generated_files is only
needed for files that can be the target of a #include. So, this patch
removes it.
gdb/ChangeLog
2019-10-21 Tom Tromey <tom@tromey.com>
* configure.ac (nm.h): Conditionally create nm.h link. Subst
NM_H. Use AC_CONFIG_LINKS.
* configure: Rebuild.
* Makefile.in (NM_H): New variable.
(generated_files): Add NM_H. Remove gcore.
(nm.h, stamp-nmh): New targets.
Change-Id: I8dd539785d52455e85389425e4bb996c8a127a0e
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9d07ac0..b6caa2c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -812,6 +812,7 @@ LOADLIBES = @LOADLIBES@ MH_CFLAGS = @MH_CFLAGS@ XM_CLIBS = @XM_CLIBS@ NAT_GENERATED_FILES = @NAT_GENERATED_FILES@ +NM_H = @NM_H@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@ # Native-target dependent makefile fragment comes in here. @@ -1617,9 +1618,9 @@ DISTSTUFF = $(YYFILES) generated_files = \ ada-lex.c \ config.h \ - gcore \ jit-reader.h \ - $(NAT_GENERATED_FILES) + $(NAT_GENERATED_FILES) \ + $(NM_H) # Flags needed to compile Python code PYTHON_CFLAGS = @PYTHON_CFLAGS@ @@ -2021,6 +2022,10 @@ config.h: stamp-h ; @true stamp-h: $(srcdir)/config.in config.status $(SHELL) config.status config.h +nm.h: stamp-nmh ; @true +stamp-nmh: config.status + $(SHELL) config.status nm.h + config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ../bfd/development.sh $(SHELL) config.status --recheck |