proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-10-19 16:07:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
https://bugs.llvm.org/show_bug.cgi?id=43589
This commit is contained in:
Sylvestre Ledru 2019-10-07 16:50:18 +02:00
parent 5dc07d2ae4
commit ef8b340942
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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 * 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 <sylvestre@debian.org> Fri, 04 Oct 2019 15:30:37 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Fri, 04 Oct 2019 15:30:37 +0200

39
debian/patches/revert-r373769.diff vendored Normal file
View File

@ -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 $<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()

1
debian/patches/series vendored
View File

@ -134,3 +134,4 @@ workaround-bug-42994-use-linker.diff
# bug 939472 # bug 939472
#try-to-unbreak-thinlto.diff #try-to-unbreak-thinlto.diff
D67877.patch D67877.patch
revert-r373769.diff