diff --git a/config/debug/gdb.in.gdbserver b/config/debug/gdb.in.gdbserver
index feb3a0d6..2f5576b6 100644
--- a/config/debug/gdb.in.gdbserver
+++ b/config/debug/gdb.in.gdbserver
@@ -3,8 +3,8 @@
 config GDB_GDBSERVER
     bool
     prompt "gdbserver"
+    default y
     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.
 
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index 634b13bd..915debd8 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -5,7 +5,6 @@ config GDB_NATIVE
     prompt "Native gdb"
     depends on ! BARE_METAL
     depends on ! BACKEND
-    depends on CC_LANG_CXX || !GDB_7_12_or_later
     select EXPAT_TARGET
     select NCURSES_TARGET
     help
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 23709643..b61902e3 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -179,6 +179,9 @@ do_debug_gdb_build() {
 
         native_extra_config=("${extra_config[@]}")
 
+        # We may not have C++ language configured for target
+        native_extra_config+=("--disable-build-with-cxx")
+
         # GDB on Mingw depends on PDcurses, not ncurses
         if [ "${CT_MINGW32}" != "y" ]; then
             native_extra_config+=("--with-curses")
@@ -293,6 +296,9 @@ do_debug_gdb_build() {
 
         gdbserver_extra_config=("${extra_config[@]}")
 
+        # We may not have C++ language configured for target
+        gdbserver_extra_config+=("--disable-build-with-cxx")
+
         if [ "${CT_GDB_GDBSERVER_HAS_IPA_LIB}" = "y" ]; then
             if [ "${CT_GDB_GDBSERVER_BUILD_IPA_LIB}" = "y" ]; then
                 gdbserver_extra_config+=( --enable-inprocess-agent )