From 3f16a8e2697237df61f0eba3c23148126c925e17 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 6 May 2018 15:20:50 -0700 Subject: Restore a missing GDB option (whether GDB has --disable-build-with-cxx) and use it. Signed-off-by: Alexey Neyman --- scripts/build/debug/300-gdb.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 74744cc7..0d0701af 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 -- cgit v1.2.3