diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 3fa6fe9d..3fdba7fd 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -1,10 +1,10 @@
 include required runtimes as dependencies to openmp targets to make sure
 they are built first when included as part of a runtimes build since openmp
 can depend on them
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/llvm/runtimes/CMakeLists.txt
 @@ -247,6 +247,7 @@ function(runtime_default_target)
                                        -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
                                        -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CM
      # We need to add the runtimes as a dependency because compiler-rt can be
      # built as part of runtimes and we need the profile runtime for PGO
      add_dependencies(clang-bootstrap-deps runtimes)
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/CMakeLists.txt
 @@ -119,6 +119,28 @@ else()
    get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
  endif()
@@ -55,37 +55,35 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeList
  # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
  # to enable time profiling support in the OpenMP runtime.
  add_subdirectory(runtime)
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt
-@@ -51,3 +51,5 @@ else()
-   libomptarget_say("Not generating NVIDIA tests, no supported devices detected."
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/cuda/CMakeLists.txt
+@@ -33,3 +33,5 @@ else()
+   message(STATUS "Not generating NVIDIA tests, no supported devices detected."
                     " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
  endif()
 +
 +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda)
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt
-@@ -50,7 +50,10 @@ add_llvm_library(omptarget
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/src/CMakeLists.txt
+@@ -38,6 +38,9 @@ add_llvm_library(omptarget
    NO_INSTALL_RPATH
    BUILDTREE_ONLY
  )
--target_include_directories(omptarget PRIVATE 
 +
 +add_runtimes_build_depends_if_needed(omptarget)
 +
-+target_include_directories(omptarget PRIVATE
+ target_include_directories(omptarget PRIVATE
    ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR}
  )
- 
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt
-@@ -323,6 +323,10 @@ if(LIBOMP_STATS)
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/CMakeLists.txt
+@@ -326,6 +326,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
  
@@ -96,11 +94,11 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/C
  # Shared library can be switched to a static library
  set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
    "Shared library instead of static library?")
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt
-@@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/runtime/src/CMakeLists.txt
+@@ -151,6 +151,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
    set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
@@ -108,7 +106,7 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/s
  else()
    set(LIBOMP_LINKER_LANGUAGE CXX)
  endif()
-@@ -217,6 +218,8 @@ else()
+@@ -216,6 +217,8 @@ else()
    )
  endif()
  
@@ -117,10 +115,10 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/s
  # Get the library's location within the build tree for the unit tester
  if(NOT WIN32)
    get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY)
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)
@@ -131,10 +129,10 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/arc
    install(TARGETS archer archer_static
      LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
      ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
-Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/host/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd.orig/offload/plugins-nextgen/host/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240518075939+219476d20fcd/offload/plugins-nextgen/host/CMakeLists.txt
 @@ -31,6 +31,8 @@ else()
    target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi)
  endif()