From 9c824cee179818d107a25657aa22f8c10d36eab9 Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 27 Feb 2025 16:55:55 +0100
Subject: [PATCH 1/3] chore(ci): use toolchain v4 for arm64 runners

---
 .evergreen/setup-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
index 7526c19cc2..4aefd4e95e 100755
--- a/.evergreen/setup-env.sh
+++ b/.evergreen/setup-env.sh
@@ -2,7 +2,7 @@ set -e
 set -x
 
 OS_ARCH="$(uname "-m")"
-if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
+if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] || [ "$OS_ARCH" = "arm64" ]; then
     echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
     export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
 else

From 5298acc40fb0cbc019e5120b41246a8475f7e001 Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 27 Feb 2025 22:56:49 +0100
Subject: [PATCH 2/3] Don't use gcc on macOS

---
 .evergreen/install-node-source.sh | 22 ++++++++++++----------
 .evergreen/setup-env.sh           | 16 +++++++++-------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.evergreen/install-node-source.sh b/.evergreen/install-node-source.sh
index ef4deb3cc5..8e1065b909 100755
--- a/.evergreen/install-node-source.sh
+++ b/.evergreen/install-node-source.sh
@@ -15,11 +15,19 @@ else
     echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
     export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
 fi
-export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
+export PATH="$TOOLCHAIN_PATH:${ORIGINAL_PATH}"
 
-export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
-export CC=gcc
-export CXX=g++
+
+if [ `uname` != Darwin ]; then
+    export CC=gcc
+    export CXX=g++
+
+    echo "Using gcc version:"
+    (which gcc && gcc --version)
+
+    echo "Using g++ version:"
+    (which g++ && g++ --version)
+fi
 
 NODE_JS_TARBALL_FILE="node-v${NODE_JS_VERSION}.tar.gz"
 NODE_JS_TARBALL_PATH="${EVGDIR}/${NODE_JS_TARBALL_FILE}"
@@ -29,12 +37,6 @@ NODE_JS_SOURCE_PATH="${EVGDIR}/node-v${NODE_JS_VERSION}"
 # scripts to simply do `nvm use`
 NODE_JS_INSTALL_DIR="${NVM_DIR}/versions/node/v${NODE_JS_VERSION}"
 
-echo "Using gcc version:"
-(which gcc && gcc --version)
-
-echo "Using g++ version:"
-(which g++ && g++ --version)
-
 echo "Using python3 version:"
 (which python3 && python3 --version) || true
 
diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
index 4aefd4e95e..87b6a2e937 100755
--- a/.evergreen/setup-env.sh
+++ b/.evergreen/setup-env.sh
@@ -2,7 +2,7 @@ set -e
 set -x
 
 OS_ARCH="$(uname "-m")"
-if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] || [ "$OS_ARCH" = "arm64" ]; then
+if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ]; then
     echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
     export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
 else
@@ -38,14 +38,16 @@ if [ "$OS" != "Windows_NT" ]; then
   set -x
   export PATH="$NVM_BIN:$PATH"
 
-  export CC=gcc
-  export CXX=g++
+  if [ `uname` != Darwin ]; then
+    export CC=gcc
+    export CXX=g++
 
-  echo "Using gcc version:"
-  (which gcc && gcc --version)
+    echo "Using gcc version:"
+    (which gcc && gcc --version)
 
-  echo "Using g++ version:"
-  (which g++ && g++ --version)
+    echo "Using g++ version:"
+    (which g++ && g++ --version)
+  fi
 
   if [ -x "$BASEDIR/git-2/git" ]; then
     export GIT_EXEC_PATH="$BASEDIR/git-2"

From c0a79015e2d19f949ca5ed3f4e670e67d212ff1e Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Fri, 28 Feb 2025 11:41:49 +0100
Subject: [PATCH 3/3] print clang versions

---
 .evergreen/install-node-source.sh | 8 +++++++-
 .evergreen/setup-env.sh           | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.evergreen/install-node-source.sh b/.evergreen/install-node-source.sh
index 8e1065b909..f62dcf547d 100755
--- a/.evergreen/install-node-source.sh
+++ b/.evergreen/install-node-source.sh
@@ -18,7 +18,13 @@ fi
 export PATH="$TOOLCHAIN_PATH:${ORIGINAL_PATH}"
 
 
-if [ `uname` != Darwin ]; then
+if [ `uname` = Darwin ]; then
+    echo "Using clang version:"
+    (which clang && clang --version)
+
+    echo "Using clang++ version:"
+    (which clang++ && clang++ --version)
+else
     export CC=gcc
     export CXX=g++
 
diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
index 87b6a2e937..ad669f7ace 100755
--- a/.evergreen/setup-env.sh
+++ b/.evergreen/setup-env.sh
@@ -38,7 +38,13 @@ if [ "$OS" != "Windows_NT" ]; then
   set -x
   export PATH="$NVM_BIN:$PATH"
 
-  if [ `uname` != Darwin ]; then
+  if [ `uname` = Darwin ]; then
+    echo "Using clang version:"
+    (which clang && clang --version)
+
+    echo "Using clang++ version:"
+    (which clang++ && clang++ --version)
+  else
     export CC=gcc
     export CXX=g++