ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-23 10:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #960 from stilor/gdb712-disable-cxx

Browse Source 
Restore a missing GDB option
This commit is contained in:
Alexey Neyman 2018-05-06 15:22:44 -07:00 committed by GitHub
commit 7d3d4d9e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/debug/gdb.in
View File

@ -17,3 +17,10 @@ config GDB_HAS_PYTHON
config GDB_INSTALL_GDBINIT config GDB_INSTALL_GDBINIT
bool bool
default y if GDB_7_0_or_later 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

1
config/debug/gdb.in.gdbserver
View File

@ -16,7 +16,6 @@ config GDB_GDBSERVER_HAS_IPA_LIB
depends on GDB_7_2_or_later depends on GDB_7_2_or_later
default y default y
# gdbserver is then linked with "-static -Wl,--dynamic-list=..." which
config GDB_GDBSERVER_STATIC config GDB_GDBSERVER_STATIC
bool bool
prompt "Build a static gdbserver" prompt "Build a static gdbserver"

2
packages/gdb/package.desc
View File

@ -1,5 +1,5 @@
origin='GNU' origin='GNU'
repository='git git://sourceware.org/git/binutils-gdb.git' repository='git git://sourceware.org/git/binutils-gdb.git'
mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)' 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' archive_formats='.tar.xz .tar.gz'

8
scripts/build/debug/300-gdb.sh
View File

@ -44,6 +44,10 @@ do_debug_gdb_build() {
cross_extra_config=("${extra_config[@]}") 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 # For gdb-cross this combination of flags forces
# gdb configure to fall back to default '-lexpat' flag # gdb configure to fall back to default '-lexpat' flag
# which is acceptable. # which is acceptable.
@ -198,7 +202,7 @@ do_debug_gdb_build() {
native_extra_config=("${extra_config[@]}") native_extra_config=("${extra_config[@]}")
# We may not have C++ language configured for target # 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") native_extra_config+=("--disable-build-with-cxx")
fi fi
@ -322,7 +326,7 @@ do_debug_gdb_build() {
gdbserver_extra_config=("${extra_config[@]}") gdbserver_extra_config=("${extra_config[@]}")
# We may not have C++ language configured for target # 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") gdbserver_extra_config+=("--disable-build-with-cxx")
fi fi