aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rwxr-xr-xgdb/configure9
-rw-r--r--gdb/configure.ac3
-rw-r--r--gdb/selftest.m43
4 files changed, 13 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 490d9cb..eef1e64 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2020-03-12 Simon Marchi <simon.marchi@efficios.com>
+ * configure.ac: Don't source bfd/development.sh.
+ * selftest.m4: Modify comment.
+ * configure: Re-generate.
+
+2020-03-12 Simon Marchi <simon.marchi@efficios.com>
+
* selftest.m4 (GDB_AC_SELFTEST): Error out if $development is
not "true" or "false".
* configure: Re-generate.
diff --git a/gdb/configure b/gdb/configure
index dd34688..f690cf8 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -2988,9 +2988,6 @@ fi
-# Set the 'development' global.
-. $srcdir/../bfd/development.sh
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12434,6 +12431,9 @@ $as_echo "$ac_cv_path_SED" >&6; }
rm -f conftest.sed
+ # 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 :
@@ -19186,7 +19186,8 @@ $as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h
#
# 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/gdb/configure.ac b/gdb/configure.ac
index 1cba1e8..76c396c 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -24,9 +24,6 @@ AC_INIT(main.c)
AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h])
AM_MAINTAINER_MODE
-# Set the 'development' global.
-. $srcdir/../bfd/development.sh
-
AC_PROG_CC
AC_PROG_CXX
diff --git a/gdb/selftest.m4 b/gdb/selftest.m4
index a88aa96..3624f25 100644
--- a/gdb/selftest.m4
+++ b/gdb/selftest.m4
@@ -26,7 +26,8 @@ AC_DEFUN([GDB_AC_SELFTEST],[
#
# 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.
AS_IF([test "x$development" != xtrue && test "x$development" != xfalse],
[AC_MSG_ERROR([Invalid value for \$development, got "$development", expecting "true" or "false".])])