diff --git a/debian/changelog b/debian/changelog index 964b9fce..fed5a8dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -llvm-toolchain-snapshot (1:10~svn373746-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:10~svn373912-1~exp1) experimental; urgency=medium * New snapshot release - * Installl pp-trace & clang-move into clang-tools-10 + * Install pp-trace & clang-move into clang-tools-10 + * revert-r373769.diff: Try to revert r373769 to see if unbreak + https://bugs.llvm.org/show_bug.cgi?id=43589 -- Sylvestre Ledru Fri, 04 Oct 2019 15:30:37 +0200 diff --git a/debian/patches/revert-r373769.diff b/debian/patches/revert-r373769.diff new file mode 100644 index 00000000..bef0f8c1 --- /dev/null +++ b/debian/patches/revert-r373769.diff @@ -0,0 +1,39 @@ +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 1d584d0d..9aa481d8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -134,3 +134,4 @@ workaround-bug-42994-use-linker.diff # bug 939472 #try-to-unbreak-thinlto.diff D67877.patch +revert-r373769.diff