[Scummvm-git-logs] scummvm master -> 18fbb84d0055722a404a43abc075ee7dffe550ce

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
18fbb84d00 CONFIGURE: Work around segfault when detecting best debug mode


Commit: 18fbb84d0055722a404a43abc075ee7dffe550ce
    https://github.com/scummvm/scummvm/commit/18fbb84d0055722a404a43abc075ee7dffe550ce
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-10-14T19:21:23+02:00

Commit Message:
CONFIGURE: Work around segfault when detecting best debug mode

I'm not pretending I understand this, but until someone comes up with a
better way, forcing it to use DWARF version 4 instead of the default
(which is 5 "for most targets") seems to work for me. But if it breaks
for anyone else, please don't hesitate to speak up.

Changed paths:
    configure


diff --git a/configure b/configure
index 8c1a5d6b2f3..ff5ca4f1ed2 100755
--- a/configure
+++ b/configure
@@ -2455,8 +2455,15 @@ if test "$_debug_build" != no; then
 	echo_n -- "$debug_mode"
 
 	echo "int main() { return 0; }" > $TMPC
-	if `which $_dwp >/dev/null 2>&1` && cc_check_no_clean $debug_mode -gsplit-dwarf && `$_dwp -e $TMPO -o /dev/null >/dev/null 2>&1`; then
-		append_var CXXFLAGS "-gsplit-dwarf"
+
+	# HACK: The default DWARF version "for most targets" is 5. However, that
+	#       causes a segfault on at least some Linux distributions. Related
+	#       to https://sourceware.org/bugzilla/show_bug.cgi?id=15447
+	#       perhaps? That bug report suggests using DWARF version 4, so
+	#       let's do that for now, because it seems to work.
+
+	if `which $_dwp >/dev/null 2>&1` && cc_check_no_clean $debug_mode -gsplit-dwarf -gdwarf-4 && `$_dwp -e $TMPO -o /dev/null >/dev/null 2>&1`; then
+		append_var CXXFLAGS "-gsplit-dwarf -gdwarf-4"
 		add_line_to_config_mk "SPLIT_DWARF = 1"
 		echo_n -- " + split DWARF"
 		if test "$_lld" = yes && cc_check_no_clean $debug_mode -gsplit-dwarf -fuse-ld=lld -Wl,--gdb-index; then