From 3f16a8e2697237df61f0eba3c23148126c925e17 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 6 May 2018 15:20:50 -0700 Subject: Restore a missing GDB option (whether GDB has --disable-build-with-cxx) and use it. Signed-off-by: Alexey Neyman --- config/debug/gdb.in | 7 +++++++ config/debug/gdb.in.gdbserver | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'config/debug') diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 02882aa0..a9fab104 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -17,3 +17,10 @@ config GDB_HAS_PYTHON config GDB_INSTALL_GDBINIT bool default y if GDB_7_0_or_later + +# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure +# switch to fall back to C. We want to use that option because +# the conversion in 7.12 was incomplete and had some breakages. +config GDB_HAS_DISABLE_CXX_BUILD + def_bool y + depends on GDB_7_12_or_later && !GDB_8_0_or_later diff --git a/config/debug/gdb.in.gdbserver b/config/debug/gdb.in.gdbserver index 8e999b41..d7f1bb81 100644 --- a/config/debug/gdb.in.gdbserver +++ b/config/debug/gdb.in.gdbserver @@ -16,7 +16,6 @@ config GDB_GDBSERVER_HAS_IPA_LIB depends on GDB_7_2_or_later default y -# gdbserver is then linked with "-static -Wl,--dynamic-list=..." which config GDB_GDBSERVER_STATIC bool prompt "Build a static gdbserver" -- cgit v1.2.3