Skip to content

Commit

Permalink
gdbsupport: Fix config.status dependency
Browse files Browse the repository at this point in the history
Commit 171fba1 ("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 171fba1 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.
  • Loading branch information
a4lg committed Sep 8, 2022
1 parent f42546b commit 11d2991
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions gdbsupport/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
Expand Down
2 changes: 1 addition & 1 deletion gdbsupport/configure
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gdbsupport/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 11d2991

Please sign in to comment.