From: Tsukasa OI <research_trasio@irq.a4lg.com>
Date: Thu, 8 Sep 2022 02:54:15 +0000 (+0000)
Subject: gdbsupport: Fix config.status dependency
X-Git-Tag: gdb-13-branchpoint~1251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39eedb20b7e95e469d11667c11233233e9d0226b;p=thirdparty%2Fbinutils-gdb.git

gdbsupport: Fix config.status dependency

Commit 171fba11ab27 ("Make GDBserver abort on internal error in development mode")
created a new substitution CONFIG_STATUS_DEPENDENCIES but this is used by
Makefile.in (which is not regenerated by that commit).  After regenerating
it, it is found that CONFIG_STATUS_DEPENDENCIES value is not valid, making
gdbsupport fail to build.

Since the CONFIG_STATUS_DEPENDENCIES value is used in the Makefile, macro
substitution must have a Makefile format but commit 171fba11ab27 used shell
format "$srcdir/../bfd/development.sh".

This commit fixes this issue by substituting "$srcdir" (shell format) to
"$(srcdir)" (Makefile format).  It preserves the dependency as Pedro
intended and fixes the build problem.

It also regenerates corresponding files with the maintainer mode.

gdbsupport/ChangeLog:

	* configure.ac: Fix config.status dependency.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
---

diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index bdceff3b56a..6aadae41031 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/gdbsupport/configure b/gdbsupport/configure
index 0b48521deb6..1b0752609e5 100755
--- a/gdbsupport/configure
+++ b/gdbsupport/configure
@@ -10470,7 +10470,7 @@ $as_echo "#define USE_WIN32API 1" >>confdefs.h
     ;;
 esac
 
-CONFIG_STATUS_DEPENDENCIES='$srcdir/../bfd/development.sh'
+CONFIG_STATUS_DEPENDENCIES='$(srcdir)/../bfd/development.sh'
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/gdbsupport/configure.ac b/gdbsupport/configure.ac
index ac2ade6a220..3b461bc82de 100644
--- a/gdbsupport/configure.ac
+++ b/gdbsupport/configure.ac
@@ -81,7 +81,7 @@ case ${host} in
     ;;
 esac
 
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$srcdir/../bfd/development.sh'])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(srcdir)/../bfd/development.sh'])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT