diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-08-29 10:39:57 -0400 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-10-17 13:21:24 -0600 |
| commit | c5adaa1921c34d2b9711ec7cecd3cb4a253620db (patch) | |
| tree | a840f7bd058978c83003aac6fc3fd828530916c7 /gdb/Makefile.in | |
| parent | 95c746ccc47cbf927ff2cbebabf910859b090164 (diff) | |
| download | gdb-c5adaa1921c34d2b9711ec7cecd3cb4a253620db.zip gdb-c5adaa1921c34d2b9711ec7cecd3cb4a253620db.tar.gz gdb-c5adaa1921c34d2b9711ec7cecd3cb4a253620db.tar.bz2 | |
Fix creation of stamp-h by gdb's configure script
I happened to notice that "make" would always print:
CONFIG_HEADERS=config.h:config.in \
CONFIG_COMMANDS="default depdir" \
CONFIG_FILES= \
CONFIG_LINKS= \
/bin/sh config.status
config.status: creating config.h
config.status: config.h is unchanged
on every rebuild. This seems to have changed due to an autoconf
upgrade at some point in the past. In the autoconf gdb uses now, it
works to use AC_CONFIG_HEADERS and then create the stamp file via the
"commands" argument.
This patch also fixes up Makefile.in to use the new-style
config.status invocation. It's no longer necessary to pass the output
file names via environment variables.
gdb/ChangeLog
2019-10-17 Tom Tromey <tromey@adacore.com>
* configure: Rebuild.
* configure.ac: Use AC_CONFIG_HEADERS. Create stamp-h there, not
in AC_CONFIG_FILES invocation.
* Makefile.in (Makefile, data-directory/Makefile, stamp-h): Use
new-style config.status invocation.
gdb/gdbserver/ChangeLog
2019-10-17 Tom Tromey <tromey@adacore.com>
* configure: Rebuild.
* configure.ac: Use AC_CONFIG_HEADERS. Create stamp-h there, not
in AC_CONFIG_FILES invocation.
* Makefile.in (stamp-h, Makefile): Use new-style config.status
invocation.
Change-Id: Ia0530d1c5b9756812d29ddb8dc1062326155e61e
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 8fec099..9d07ac0 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1996,18 +1996,10 @@ subdir_do: force done Makefile: Makefile.in config.status - # Regenerate the Makefile and the tm.h / nm.h links. - CONFIG_FILES="Makefile" \ - CONFIG_COMMANDS= \ - CONFIG_HEADERS= \ - $(SHELL) config.status + $(SHELL) config.status $@ data-directory/Makefile: data-directory/Makefile.in config.status - CONFIG_FILES="data-directory/Makefile" \ - CONFIG_COMMANDS="depfiles" \ - CONFIG_HEADERS= \ - CONFIG_LINKS= \ - $(SHELL) config.status + $(SHELL) config.status $@ .PHONY: run run: Makefile @@ -2027,11 +2019,7 @@ gdb-gdb.gdb: $(srcdir)/gdb-gdb.gdb.in config.h: stamp-h ; @true stamp-h: $(srcdir)/config.in config.status - CONFIG_HEADERS=config.h:config.in \ - CONFIG_COMMANDS="default depdir" \ - CONFIG_FILES= \ - CONFIG_LINKS= \ - $(SHELL) config.status + $(SHELL) config.status config.h config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ../bfd/development.sh $(SHELL) config.status --recheck |