diff --git a/debian/patches/revert-r373769.diff b/debian/patches/revert-r373769.diff deleted file mode 100644 index bef0f8c1..00000000 --- a/debian/patches/revert-r373769.diff +++ /dev/null @@ -1,39 +0,0 @@ -Index: clang/tools/clang-shlib/CMakeLists.txt -=================================================================== ---- a/clang/tools/clang-shlib/CMakeLists.txt (révision 373769) -+++ b/clang/tools/clang-shlib/CMakeLists.txt (révision 373768) -@@ -6,13 +6,7 @@ - get_property(clang_libs GLOBAL PROPERTY CLANG_STATIC_LIBS) - - foreach (lib ${clang_libs}) -- if(XCODE) -- # Xcode doesn't support object libraries, so we have to trick it into -- # linking the static libraries instead. -- list(APPEND _DEPS "-force_load" ${lib}) -- else() -- list(APPEND _OBJECTS $) -- endif() -+ list(APPEND _OBJECTS $) - list(APPEND _DEPS $) - list(APPEND _DEPS $) - endforeach () -Index: clang/cmake/modules/AddClang.cmake -=================================================================== ---- a/clang/cmake/modules/AddClang.cmake (révision 373769) -+++ b/clang/cmake/modules/AddClang.cmake (révision 373768) -@@ -86,13 +86,9 @@ - # llvm_add_library ignores BUILD_SHARED_LIBS if STATIC is explicitly set, - # so we need to handle it here. - if(BUILD_SHARED_LIBS) -- set(LIBTYPE SHARED) -+ set(LIBTYPE SHARED OBJECT) - else() -- set(LIBTYPE STATIC) -- endif() -- if(NOT XCODE) -- # The Xcode generator doesn't handle object libraries correctly. -- list(APPEND LIBTYPE OBJECT) -+ set(LIBTYPE STATIC OBJECT) - endif() - set_property(GLOBAL APPEND PROPERTY CLANG_STATIC_LIBS ${name}) - endif() diff --git a/debian/patches/series b/debian/patches/series index 1ff407c4..865e651b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -134,5 +134,4 @@ workaround-bug-42994-use-linker.diff # bug 939472 #try-to-unbreak-thinlto.diff D67877.patch - revert-r373786-libclang-cpp.diff