From ea16b4a909c567dcd5c38fd0539b4ae7f1b5deda Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 27 Mar 2025 09:57:12 +0100
Subject: [PATCH 1/4] set faiss related *san options

---
 scripts/lib/buildSanFlags.fish | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/buildSanFlags.fish b/scripts/lib/buildSanFlags.fish
index 1b74a934..b584ba15 100644
--- a/scripts/lib/buildSanFlags.fish
+++ b/scripts/lib/buildSanFlags.fish
@@ -9,7 +9,8 @@ function buildSanFlags --argument SRCDIR
     if not test -z "$SAN"; and test "$SAN" = "On"
       echo "Use SAN mode: $SAN_MODE"
       set common_options "log_exe_name=true:external_symbolizer_path=$INNERWORKDIR/ArangoDB/utils/llvm-symbolizer-client.py"
-
+      set -xg ARCHER_OPTIONS "verbose=1"
+      set -xg OMP_TOOL_LIBRARIES /usr/lib/llvm-19/lib/libarcher.so
       switch "$SAN_MODE"
         case "AULSan"
           # address sanitizer
@@ -43,7 +44,7 @@ function buildSanFlags --argument SRCDIR
 
           # suppressions
           if test -f "$SRCDIR/tsan_arangodb_suppressions.txt"
-            set -xg TSAN_OPTIONS "$TSAN_OPTIONS:suppressions=$INNERWORKDIR/ArangoDB/tsan_arangodb_suppressions.txt:print_suppressions=0"
+            set -xg TSAN_OPTIONS "$TSAN_OPTIONS:suppressions=$INNERWORKDIR/ArangoDB/tsan_arangodb_suppressions.txt:print_suppressions=0:ignore_noninstrumented_modules=1"
           end
 
           echo "TSAN: $TSAN_OPTIONS"

From 392c41afe3919afd4c66e75c6dd2ca5b3eb9e65c Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 27 Mar 2025 10:44:10 +0100
Subject: [PATCH 2/4] set library dir of the respective compiler

---
 helper.linux.fish              | 22 ++++++++++++++++++++++
 scripts/lib/buildSanFlags.fish |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/helper.linux.fish b/helper.linux.fish
index eb2bb1b8..c0920ef1 100755
--- a/helper.linux.fish
+++ b/helper.linux.fish
@@ -83,6 +83,28 @@ function compiler
   end
 end
 
+function compiler_libraries
+  set -l cversion $argv[1]
+
+  if test "$cversion" = ""
+    set -e COMPILER_VERSION
+    return 0
+  end
+
+  switch $cversion
+    case 13.2.0
+      set -xg COMPILER_LIB_DIR /usr/lib/gcc-13/lib/
+    case clang16.0.6
+      set -xg COMPILER_LIB_DIR /usr/lib/llvm-16/lib/
+
+    case clang19.1.7
+      set -xg COMPILER_LIB_DIR /usr/lib/llvm-19/lib/
+
+    case '*'
+      echo "unknown compiler version $cversion"
+  end
+end
+
 function opensslVersion
   set -l oversion $argv[1]
 
diff --git a/scripts/lib/buildSanFlags.fish b/scripts/lib/buildSanFlags.fish
index b584ba15..307d6ac7 100644
--- a/scripts/lib/buildSanFlags.fish
+++ b/scripts/lib/buildSanFlags.fish
@@ -7,10 +7,11 @@ function buildSanFlags --argument SRCDIR
     # Enable full SAN mode
     # This also has to be in runRTAtest.fish
     if not test -z "$SAN"; and test "$SAN" = "On"
+      compiler_libraries "$COMPILER_VERSION"
       echo "Use SAN mode: $SAN_MODE"
       set common_options "log_exe_name=true:external_symbolizer_path=$INNERWORKDIR/ArangoDB/utils/llvm-symbolizer-client.py"
       set -xg ARCHER_OPTIONS "verbose=1"
-      set -xg OMP_TOOL_LIBRARIES /usr/lib/llvm-19/lib/libarcher.so
+      set -xg OMP_TOOL_LIBRARIES "$COMPILER_LIB_DIR/libarcher.so"
       switch "$SAN_MODE"
         case "AULSan"
           # address sanitizer

From e607e4c0f315f29950555e45bd05ae59b005b346 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 27 Mar 2025 13:15:25 +0100
Subject: [PATCH 3/4] dequote

---
 scripts/lib/buildSanFlags.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/buildSanFlags.fish b/scripts/lib/buildSanFlags.fish
index 307d6ac7..d7e5d6f5 100644
--- a/scripts/lib/buildSanFlags.fish
+++ b/scripts/lib/buildSanFlags.fish
@@ -10,7 +10,7 @@ function buildSanFlags --argument SRCDIR
       compiler_libraries "$COMPILER_VERSION"
       echo "Use SAN mode: $SAN_MODE"
       set common_options "log_exe_name=true:external_symbolizer_path=$INNERWORKDIR/ArangoDB/utils/llvm-symbolizer-client.py"
-      set -xg ARCHER_OPTIONS "verbose=1"
+      set -xg ARCHER_OPTIONS verbose=1
       set -xg OMP_TOOL_LIBRARIES "$COMPILER_LIB_DIR/libarcher.so"
       switch "$SAN_MODE"
         case "AULSan"

From ffb833a6aff59018536c3da2a123fe1c1ce5d358 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 3 Apr 2025 13:12:26 +0200
Subject: [PATCH 4/4] de-duplicate /

---
 helper.linux.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helper.linux.fish b/helper.linux.fish
index c0920ef1..9bd829e2 100755
--- a/helper.linux.fish
+++ b/helper.linux.fish
@@ -93,12 +93,12 @@ function compiler_libraries
 
   switch $cversion
     case 13.2.0
-      set -xg COMPILER_LIB_DIR /usr/lib/gcc-13/lib/
+      set -xg COMPILER_LIB_DIR /usr/lib/gcc-13/lib
     case clang16.0.6
-      set -xg COMPILER_LIB_DIR /usr/lib/llvm-16/lib/
+      set -xg COMPILER_LIB_DIR /usr/lib/llvm-16/lib
 
     case clang19.1.7
-      set -xg COMPILER_LIB_DIR /usr/lib/llvm-19/lib/
+      set -xg COMPILER_LIB_DIR /usr/lib/llvm-19/lib
 
     case '*'
       echo "unknown compiler version $cversion"