From 8018f3fa3d7b04c67d68306db2974b1daff39c0a Mon Sep 17 00:00:00 2001
From: Adam Siemieniuk <adam.siemieniuk@intel.com>
Date: Fri, 13 Sep 2024 11:12:19 +0200
Subject: [PATCH] Bump LLVM (#967)

Improves CI script to handle errors at the build configuration step.
---
 build_tools/llvm_version.txt    |  2 +-
 scripts/buildkite/build_llvm.sh | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index ef1e144e5..dc0d45c25 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1 +1 @@
-2641ed7d26198557a63ce447a0584a96494a5ac4
+bf684034844c660b778f0eba103582f582b710c9
diff --git a/scripts/buildkite/build_llvm.sh b/scripts/buildkite/build_llvm.sh
index 2c94ee7b8..1f8704aed 100755
--- a/scripts/buildkite/build_llvm.sh
+++ b/scripts/buildkite/build_llvm.sh
@@ -136,6 +136,12 @@ echo_run cmake -Wno-dev -G Ninja \
     -DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL_DIR} \
     ${LLVM_BUILD_EXTENSIONS}
 
+if [ $? != 0 ]; then
+  rm -r ${LLVM_INSTALL_DIR}
+  rm -r ${LLVM_BUILD_DIR}
+  exit 1
+fi
+
 # Build LLVM
 echo "--- BUILD"
 echo_run ninja -C ${LLVM_BUILD_DIR} all
@@ -167,3 +173,7 @@ fi
 # Cleanup
 echo "--- CLEANUP"
 rm -r ${LLVM_BUILD_DIR}
+if [ $? != 0 ]; then
+  echo "Failed to cleanup"
+  exit 1
+fi