From 26ce9942a3bbb68268ba8929aab6f9fee2eb1f97 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Thu, 2 Feb 2017 18:06:28 -0800
Subject: Require C++ support for gdbserver 7.12 or newer.

Also, do not select gdbserver for cross-gdb automatically, or it may
be selected even without meeting the dependencies (if C++ is not enabled)

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/debug/gdb.in.cross b/config/debug/gdb.in.cross
index fb993c9..945f8eb 100644
--- a/config/debug/gdb.in.cross
+++ b/config/debug/gdb.in.cross
@@ -7,7 +7,6 @@ config GDB_CROSS
     bool
     prompt "Cross-gdb"
     default y
-    select GDB_GDBSERVER if ! BARE_METAL
     select EXPAT_NEEDED
     select NCURSES_NEEDED
     help
diff --git a/config/debug/gdb.in.gdbserver b/config/debug/gdb.in.gdbserver
index 8d8fce5..feb3a0d 100644
--- a/config/debug/gdb.in.gdbserver
+++ b/config/debug/gdb.in.gdbserver
@@ -4,6 +4,7 @@ config GDB_GDBSERVER
     bool
     prompt "gdbserver"
     depends on ! BARE_METAL
+    depends on CC_LANG_CXX || !GDB_7_12_or_later
     help
       Build and install a gdbserver for the target, to run on the target.
 
-- 
cgit v0.10.2-6-g49f6