From d29fc2a10b6c5dcf4428d1a10b32e988a279c16f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 10 May 2024 21:14:12 +0200 Subject: [PATCH] fix patch --- debian/patches/openmp-fix-runtimes-build.diff | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 1860219c..3fa6fe9d 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -1,7 +1,6 @@ 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~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt =================================================================== --- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/llvm/runtimes/CMakeLists.txt @@ -140,7 +139,7 @@ Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins- target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() -++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") ++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") + target_include_directories(omptarget.rtl.host PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})