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/gdbserver | |
| 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/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 4 | ||||
| -rwxr-xr-x | gdb/gdbserver/configure | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/configure.ac | 9 |
4 files changed, 13 insertions, 14 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b2213cf..fa78eba 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +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. + 2019-10-16 Christian Biesinger <cbiesinger@google.com> * server.c: Include xml-builtin.h. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 34d8060..b9b5b89 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -496,10 +496,10 @@ subdir_do: force config.h: stamp-h ; @true stamp-h: config.in config.status - CONFIG_FILES="" CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status + $(SHELL) ./config.status config.h Makefile: Makefile.in config.status - CONFIG_HEADERS="" $(SHELL) ./config.status + $(SHELL) ./config.status $@ $(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../../gnulib/Makefile.in config.status @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \ diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 692cb0f..5c84eeb 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -9806,17 +9806,13 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in + "config.h":H) echo > stamp-h ;; "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;; "gdbdepdir":C) for subdir in ${CONFIG_SRC_SUBDIR} do $SHELL $ac_aux_dir/mkinstalldirs $subdir/$DEPDIR done ;; - "Makefile":F) case x$CONFIG_HEADERS in -xconfig.h:config.in) -echo > stamp-h ;; -esac - ;; esac done # for ac_tag diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 0009aac..7ebc9c3 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -19,7 +19,7 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>. dnl Process this file with autoconf to produce a configure script. AC_INIT(server.c) -AC_CONFIG_HEADER(config.h:config.in) +AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h]) AM_MAINTAINER_MODE @@ -484,11 +484,6 @@ if test x"$STDINT_H" != x; then fi AC_SUBST(GNULIB_STDINT_H) -AC_CONFIG_FILES([Makefile], -[case x$CONFIG_HEADERS in -xconfig.h:config.in) -echo > stamp-h ;; -esac -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT |