diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-05-06 22:20:50 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2018-05-06 22:20:50 (GMT) |
| commit | 3f16a8e2697237df61f0eba3c23148126c925e17 (patch) | |
| tree | bc474d038d38b8404a3ea7eaac92100b863a5819 | |
| parent | ca3701bd3decc3b5280dd4bc3463e11d14466b4a (diff) | |
Restore a missing GDB option
(whether GDB has --disable-build-with-cxx) and use it.
Signed-off-by: Alexey Neyman <stilor@att.net>
| -rw-r--r-- | config/debug/gdb.in | 7 | ||||
| -rw-r--r-- | config/debug/gdb.in.gdbserver | 1 | ||||
| -rw-r--r-- | packages/gdb/package.desc | 2 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 8 |
4 files changed, 14 insertions, 4 deletions
diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 02882aa..a9fab10 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 8e999b4..d7f1bb8 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" diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc index 0ca1dc6..b432cf9 100644 --- a/packages/gdb/package.desc +++ b/packages/gdb/package.desc @@ -1,5 +1,5 @@ origin='GNU' repository='git git://sourceware.org/git/binutils-gdb.git' mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)' -milestones='7.0 7.2 8.0' +milestones='7.0 7.2 7.12 8.0' archive_formats='.tar.xz .tar.gz' diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 74744cc..0d0701a 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -44,6 +44,10 @@ do_debug_gdb_build() { cross_extra_config=("${extra_config[@]}") + if [ "${CT_GDB_HAS_DISABLE_CXX_BUILD}" = "y" ]; then + cross_extra_config+=("--disable-build-with-cxx") + fi + # For gdb-cross this combination of flags forces # gdb configure to fall back to default '-lexpat' flag # which is acceptable. @@ -198,7 +202,7 @@ do_debug_gdb_build() { native_extra_config=("${extra_config[@]}") # We may not have C++ language configured for target - if [ "${GDB_TARGET_DISABLE_CXX_BUILD}" = "y" ]; then + if [ "${CT_GDB_HAS_DISABLE_CXX_BUILD}" = "y" ]; then native_extra_config+=("--disable-build-with-cxx") fi @@ -322,7 +326,7 @@ do_debug_gdb_build() { gdbserver_extra_config=("${extra_config[@]}") # We may not have C++ language configured for target - if [ "${GDB_TARGET_DISABLE_CXX_BUILD}" = "y" ]; then + if [ "${CT_GDB_HAS_DISABLE_CXX_BUILD}" = "y" ]; then gdbserver_extra_config+=("--disable-build-with-cxx") fi |