diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2017-10-09 12:50:58 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2017-10-09 12:50:58 -0400 |
| commit | 6e66f7538112d2f5fb1af17dbde33ba37a7171be (patch) | |
| tree | 1c58708457d42a1404962110045dd6b8597b54bb | |
| parent | 8e464506d2131fc931c4f81a22cc7125b7adf434 (diff) | |
| download | gdb-6e66f7538112d2f5fb1af17dbde33ba37a7171be.zip gdb-6e66f7538112d2f5fb1af17dbde33ba37a7171be.tar.gz gdb-6e66f7538112d2f5fb1af17dbde33ba37a7171be.tar.bz2 | |
Don't try building gdb against guile-2.2
GDB currently doesn't build with Guile 2.2 (see PR 21104). If one has
both Guile 2.2 and 2.0 installed, GDB will pick up Guile 2.2 first and
fail building. Until somebody does the work of adapting the GDB code to
Guile 2.2, we should not try using it. This patch therefore removes it
from configure.
gdb/ChangeLog:
* configure.ac (try_guile_versions): Remove guile-2.2.
* configure: Regenerate.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rwxr-xr-x | gdb/configure | 4 | ||||
| -rw-r--r-- | gdb/configure.ac | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0688f95..7c8c6e4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-09 Simon Marchi <simon.marchi@polymtl.ca> + + * configure.ac (try_guile_versions): Remove guile-2.2. + * configure: Regenerate. + 2017-10-09 Tom Tromey <tom@tromey.com> * Makefile.in (COMPILE.post, POSTCOMPILE): Restore $(basename). diff --git a/gdb/configure b/gdb/configure index 4d473cc..6b445e4 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5950,7 +5950,7 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depdir" -# Create sub-directories for objects and depedencies. +# Create sub-directories for objects and dependencies. CONFIG_SRC_SUBDIR="arch" @@ -10313,7 +10313,7 @@ fi -try_guile_versions="guile-2.2 guile-2.0" +try_guile_versions="guile-2.0" have_libguile=no case "${with_guile}" in no) diff --git a/gdb/configure.ac b/gdb/configure.ac index 4d8d6c7..4e64c80 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1138,7 +1138,7 @@ AC_MSG_RESULT([$with_guile]) dnl We check guile with pkg-config. AC_PATH_PROG(pkg_config_prog_path, pkg-config, missing) -try_guile_versions="guile-2.2 guile-2.0" +try_guile_versions="guile-2.0" have_libguile=no case "${with_guile}" in no) |