diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index a6768daf..1e3e69b3 100644 --- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff +++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff @@ -1,13 +1,13 @@ set rpath for prepare_builtins build utility to find correct stage2 libs at runtime when executed as part of a build -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libclc/CMakeLists.txt -@@ -151,6 +151,9 @@ target_compile_options( prepare_builtins +--- llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt +@@ -115,6 +115,9 @@ add_llvm_executable( prepare_builtins ut target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) - target_link_libraries( prepare_builtins PRIVATE ${LLVM_LIBS} ) - target_link_libraries( prepare_builtins PRIVATE ${LLVM_SYSTEM_LIBS} ) + # These were not properly reported in early LLVM and we don't need them + target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) +set_target_properties( prepare_builtins + PROPERTIES INSTALL_RPATH "${LLVM_LIBDIR}" + BUILD_WITH_INSTALL_RPATH "ON")