From 3c8ab2e316cce1eeffcea81d5c5d3ffbcda862f7 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 2 Aug 2021 11:57:38 +0100
Subject: [PATCH] fix valgrind args so older valgrind doesn't fail

added gcc args for debugging (valgrind, gdb, etc.)
---
 meson.build | 23 +++++++++++++++++++++++
 tbse        |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 9ae9278ec..c8d619956 100644
--- a/meson.build
+++ b/meson.build
@@ -418,6 +418,29 @@ if get_option('valgrind') == true
             cflags += [ __cflag ]
         endif
     endforeach
+    # flags to give more debugging output for valgrind (or gdb)
+    _gflags = [
+        'gdb3',
+        'split-dwarf',
+        'describe-dies',
+        'pubnames',
+    ]
+    foreach cflag : _gflags
+        __cflag = '-g' + cflag
+        if compiler.has_argument( __cflag )
+            cflags += [ __cflag ]
+        endif
+    endforeach
+    _fflags = [
+        'var-tracking',
+        'var-tracking-assignments',
+    ]
+    foreach cflag : _fflags
+        __cflag = '-f' + cflag
+        if compiler.has_argument( __cflag )
+            cflags += [ __cflag ]
+        endif
+    endforeach
 endif
 
 ############################################################
diff --git a/tbse b/tbse
index 2b4b0da9d..a1a315da5 100755
--- a/tbse
+++ b/tbse
@@ -2635,7 +2635,7 @@ $ORBITING_OBJECTS \
 VALGRIND_MAX_STACKFRAME=30000000
 VALGRIND_MAIN_STACKSIZE=30000000
 VALGRIND="valgrind --main-stacksize=$VALGRIND_MAIN_STACKSIZE --max-stackframe=$VALGRIND_MAX_STACKFRAME"
-VALGRIND_OPTS="--read-var-info=yes --track-origins=yes   --tool=memcheck --leak-check=full --show-reachable=yes --freelist-vol=100000000 --partial-loads-ok=no  --undef-value-errors=yes  -v --vgdb-error=1 "
+VALGRIND_OPTS="--read-var-info=yes --track-origins=yes   --tool=memcheck --leak-check=full --show-reachable=yes --freelist-vol=100000000 --partial-loads-ok=no  --undef-value-errors=yes  -v "
 if [[ ! -z "$VALGRIND_LOG" ]]; then
     VALGRIND_OPTS="$VALGRIND_OPTS --log-file=$VALGRIND_LOG"
 fi
-- 
GitLab