diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-11 07:54:50 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-02-11 07:54:50 (GMT) |
| commit | e6a748c06aa25802aa807256f9f9899c877ebac7 (patch) | |
| tree | 4030d9c85b2ef3ebc1d8e04259da763ee35043f4 | |
| parent | 3eed0ca09686521dddc0d41f8a21fb2eba55d6cc (diff) | |
| parent | 5920157fdd13bbd6fa26fbc215b655e6223cc1bd (diff) | |
Merge pull request #585 from stilor/disable-cxx-gdb
Supply --disable-build-with-cxx instead of requiring C++
| -rw-r--r-- | config/debug/gdb.in.gdbserver | 2 | ||||
| -rw-r--r-- | config/debug/gdb.in.native | 1 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/config/debug/gdb.in.gdbserver b/config/debug/gdb.in.gdbserver index feb3a0d..2f5576b 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 634b13b..915debd 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 2370964..b61902e 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 ) |