From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 02B9F3858C54 for ; Thu, 8 Sep 2022 06:04:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 02B9F3858C54 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 6056330008A; Thu, 8 Sep 2022 06:04:34 +0000 (UTC) From: Tsukasa OI To: Tsukasa OI , Pedro Alves Cc: gdb-patches@sourceware.org Subject: [PATCH 1/1] gdbsupport: Fix config.status dependency Date: Thu, 8 Sep 2022 06:04:20 +0000 Message-Id: <363d921e5d135e1e8d964235add673beba7cdd21.1662617054.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Sep 2022 06:04:37 -0000 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. --- gdbsupport/Makefile.in | 1 + gdbsupport/configure | 2 +- gdbsupport/configure.ac | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 -- 2.34.1