diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 0690f57b..1b63db22 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,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
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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}
@@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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~++20240423112228+dbcfb434a9c7/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/CMakeLists.txt
 @@ -129,6 +129,28 @@ else()
    get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
  endif()
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/cuda/CMakeLists.txt
 @@ -52,6 +52,8 @@ else()
                     " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.")
  endif()
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-
  # Install plugin under the lib destination folder.
  install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}")
  set_target_properties(omptarget.rtl.cuda PROPERTIES
-Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/src/CMakeLists.txt
 @@ -49,6 +49,9 @@ add_llvm_library(omptarget
    NO_INSTALL_RPATH
    BUILDTREE_ONLY
@@ -83,10 +83,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/src/CMak
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/CMakeLists.txt
 @@ -323,6 +323,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -98,10 +98,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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~++20240423112228+dbcfb434a9c7/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/runtime/src/CMakeLists.txt
 @@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/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~++20240423112228+dbcfb434a9c7/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/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)
@@ -133,16 +133,16 @@ Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/openmp/tools/arc
    install(TARGETS archer archer_static
      LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
      ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
-Index: llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/host/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7.orig/offload/plugins-nextgen/host/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240423112228+dbcfb434a9c7/offload/plugins-nextgen/host/CMakeLists.txt
+--- llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b.orig/offload/plugins-nextgen/host/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240426113138+3d5e9ab6d89b/offload/plugins-nextgen/host/CMakeLists.txt
 @@ -31,6 +31,8 @@ else()
-   target_include_directories(omptarget.rtl.${machine} PRIVATE dynamic_ffi)
+   target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi)
  endif()
  
 +add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}")
 +
  # Install plugin under the lib destination folder.
- install(TARGETS omptarget.rtl.${machine}
+ install(TARGETS omptarget.rtl.host
          LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}")