From 0ad1c7a979d8e412ad96c7af42b1ededc8dee810 Mon Sep 17 00:00:00 2001
From: Ryan Egesdahl <ryan.egesdahl@mongodb.com>
Date: Thu, 3 Mar 2022 15:00:52 +0000
Subject: SERVER-61032 Ensure all current references to GDB are for v3
 toolchain

(cherry picked from commit 65cf760916f7fe0e3d06f5e06a53e0a96b24d947)
(cherry picked from commit f7cb4b6b001045eb51465bfdd232d1c6852df8ab)
---
 buildscripts/resmokelib/hang_analyzer/dumper.py | 2 +-
 buildscripts/setup_spawnhost_coredump           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildscripts/resmokelib/hang_analyzer/dumper.py b/buildscripts/resmokelib/hang_analyzer/dumper.py
index 151eaf0d193..6d69a6d2884 100644
--- a/buildscripts/resmokelib/hang_analyzer/dumper.py
+++ b/buildscripts/resmokelib/hang_analyzer/dumper.py
@@ -210,7 +210,7 @@ class GDBDumper(Dumper):
     @staticmethod
     def __find_debugger(debugger):
         """Find the installed debugger."""
-        return find_program(debugger, ['/opt/mongodbtoolchain/gdb/bin', '/usr/bin'])
+        return find_program(debugger, ['/opt/mongodbtoolchain/v3/bin', '/usr/bin'])
 
     def dump_info(  # pylint: disable=too-many-arguments,too-many-locals
             self, root_logger, logger, pinfo, take_dump):
diff --git a/buildscripts/setup_spawnhost_coredump b/buildscripts/setup_spawnhost_coredump
index 4becf602e77..7c73efcd7f7 100644
--- a/buildscripts/setup_spawnhost_coredump
+++ b/buildscripts/setup_spawnhost_coredump
@@ -3,7 +3,7 @@
 cat >> ~/.profile <<EOF
 # Coredumps generated by a toolchain built mongodb can be problematic when examined with the system
 # gdb.
-export PATH=/opt/mongodbtoolchain/gdb/bin:$PATH
+export PATH=/opt/mongodbtoolchain/v3/bin:$PATH
 # As per below, put the user into the appropriate directory. This is where gdb is expected to be
 # invoked from.
 cd debug
@@ -21,7 +21,7 @@ echo
 echo "To examine a core dump, type 'gdb ./<binary> ./<core file>'"
 EOF
 
-export PATH=/opt/mongodbtoolchain/gdb/bin:$PATH
+export PATH=/opt/mongodbtoolchain/v3/bin:$PATH
 echo 'if [ -f ~/.profile ]; then
     . ~/.profile
 fi' >> .bash_profile
-- 
cgit v1.2.1