Commit b75d4e52 authored by Sylvestre Ledru's avatar Sylvestre Ledru

Revert "* revert-r373769.diff: Try to revert r373769 to see if unbreak"

This reverts commit ef8b3409.
parent 160dc1ad
llvm-toolchain-snapshot (1:10~svn373912-1~exp1) experimental; urgency=medium
llvm-toolchain-snapshot (1:10~svn373746-1~exp1) experimental; urgency=medium
* New snapshot release
* 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
* Installl pp-trace & clang-move into clang-tools-10
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 04 Oct 2019 15:30:37 +0200
......
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 $<TARGET_OBJECTS:obj.${lib}>)
- endif()
+ list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>)
list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
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()
......@@ -134,4 +134,3 @@ workaround-bug-42994-use-linker.diff
# bug 939472
#try-to-unbreak-thinlto.diff
D67877.patch
revert-r373769.diff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment