From d34a6bd8a0222fadfc86795f65ca9a7df232324d Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 13 Jan 2017 19:54:08 -0800 Subject: GDB 7.12 needs c++. Also, minor fixes in 300-gdb.sh Signed-off-by: Alexey Neyman --- config/debug/gdb.in | 13 ++++++------- config/debug/gdb.in.native | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'config/debug') diff --git a/config/debug/gdb.in b/config/debug/gdb.in index dd8239ff..a835b283 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -6,15 +6,13 @@ source "config/debug/gdb.in.cross" source "config/debug/gdb.in.native" source "config/debug/gdb.in.gdbserver" -if GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER - comment "gdb version" config GDB_CUSTOM bool prompt "Custom gdb" depends on EXPERIMENTAL - select GDB_7_2_or_later + select GDB_7_12_or_later help The choosen gdb version shall be not downloaded. Instead use a custom location to get the source. @@ -71,7 +69,7 @@ choice config GDB_V_7_12 bool prompt "7.12" - select GDB_7_2_or_later + select GDB_7_12_or_later config GDB_V_7_11 bool @@ -224,6 +222,10 @@ endchoice endif # ! GDB_CUSTOM +config GDB_7_12_or_later + bool + select GDB_7_2_or_later + config GDB_7_2_or_later bool select GDB_7_0_or_later @@ -280,6 +282,3 @@ config GDB_VERSION default "6.8a" if GDB_V_6_8a endif # ! GDB_CUSTOM - -endif # GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER - diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index 915debd8..634b13bd 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -5,6 +5,7 @@ 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 -- cgit v1.2.3