diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-03-12 14:18:00 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-03-12 14:18:00 -0400 |
| commit | db6878ac5538661c8d66c916a533bd4268217fcb (patch) | |
| tree | 1f0b30bbbff5a962e890827730014bbcfdc573e5 /gdbsupport | |
| parent | 4d696a5c686730d75623d7e41805e42ce5fcc60c (diff) | |
| download | gdb-db6878ac5538661c8d66c916a533bd4268217fcb.zip gdb-db6878ac5538661c8d66c916a533bd4268217fcb.tar.gz gdb-db6878ac5538661c8d66c916a533bd4268217fcb.tar.bz2 | |
Move sourcing of development.sh to GDB_AC_COMMON
The same is done for gdb, gdbserver and gdbsupport. I therefore think
it makes sense to move that to GDB_AC_COMMON.
It is required to move the call to GDB_AC_COMMON so it is before
GDB_AC_SELFTEST in gdbserver/configure.ac, otherwise the $development
variable isn't set when the code behind GDB_AC_SELFTEST executes.
gdb/ChangeLog:
* configure.ac: Don't source bfd/development.sh.
* selftest.m4: Modify comment.
* configure: Re-generate.
gdbserver/ChangeLog:
* configure.ac: Don't source bfd/development.sh, move
GDB_AC_COMMON higher.
* configure: Re-generate.
gdbsupport/ChangeLog:
* configure.ac: Don't source bfd/development.sh.
* common.m4: Source bfd/development.sh.
* configure: Re-generate.
Diffstat (limited to 'gdbsupport')
| -rw-r--r-- | gdbsupport/ChangeLog | 6 | ||||
| -rw-r--r-- | gdbsupport/common.m4 | 3 | ||||
| -rwxr-xr-x | gdbsupport/configure | 9 | ||||
| -rw-r--r-- | gdbsupport/configure.ac | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 5e4f277..e7474e1 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,5 +1,11 @@ 2020-03-12 Simon Marchi <simon.marchi@efficios.com> + * configure.ac: Don't source bfd/development.sh. + * common.m4: Source bfd/development.sh. + * configure: Re-generate. + +2020-03-12 Simon Marchi <simon.marchi@efficios.com> + * configure: Re-generate. 2020-03-11 Simon Marchi <simon.marchi@efficios.com> diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 index 68a3545..e670586 100644 --- a/gdbsupport/common.m4 +++ b/gdbsupport/common.m4 @@ -18,6 +18,9 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>. dnl Invoke configury needed by the files in 'common'. AC_DEFUN([GDB_AC_COMMON], [ + # Set the 'development' global. + . $srcdir/../bfd/development.sh + AC_HEADER_STDC AC_FUNC_ALLOCA diff --git a/gdbsupport/configure b/gdbsupport/configure index 66dc906..2ffe539 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -6569,9 +6569,6 @@ fi am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -# Set the 'development' global. -. $srcdir/../bfd/development.sh - # We require a C++11 compiler. Check if one is available, and if # necessary, set CXX_DIALECT to some -std=xxx switch. @@ -8060,6 +8057,9 @@ fi + # Set the 'development' global. + . $srcdir/../bfd/development.sh + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } if ${ac_cv_header_stdc+:} false; then : @@ -10605,7 +10605,8 @@ $as_echo "$bfd_cv_have_sys_procfs_type_elf_fpregset_t" >&6; } # # The default value of this option changes depending whether we're on # development mode (in which case it's "true") or not (in which case -# it's "false"). +# it's "false"). The $development variable is set by the GDB_AC_COMMON +# macro, which must therefore be used before GDB_AC_SELFTEST. if test "x$development" != xtrue && test "x$development" != xfalse; then : as_fn_error $? "Invalid value for \$development, got \"$development\", expecting \"true\" or \"false\"." "$LINENO" 5 diff --git a/gdbsupport/configure.ac b/gdbsupport/configure.ac index ab71a3c..401e16f 100644 --- a/gdbsupport/configure.ac +++ b/gdbsupport/configure.ac @@ -33,9 +33,6 @@ AC_USE_SYSTEM_EXTENSIONS ACX_LARGEFILE AM_PROG_CC_STDC -# Set the 'development' global. -. $srcdir/../bfd/development.sh - # We require a C++11 compiler. Check if one is available, and if # necessary, set CXX_DIALECT to some -std=xxx switch. AX_CXX_COMPILE_STDCXX(11, , mandatory) |