maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "llvm-shlib: Create object libraries for each component and link against them" 

This reverts commit 43ceb74eb1.

This caused some build failures: https://bugs.llvm.org/show_bug.cgi?id=49818
This commit is contained in:
Tom Stellard 2021-04-05 08:31:09 -07:00
parent 982396ddd7
commit e07e08f366
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/cmake/modules/AddLLVM.cmake
View File

@ -488,7 +488,6 @@ function(llvm_add_library name)
add_dependencies(${obj_name} ${link_lib})
endif()
endforeach()
target_link_libraries(${obj_name} ${ARG_LINK_LIBS})
endif()
endif()
@ -747,7 +746,7 @@ function(add_llvm_component_library name)
"COMPONENT_NAME;ADD_TO_COMPONENT"
""
${ARGN})
add_llvm_library(${name} COMPONENT_LIB OBJECT ${ARG_UNPARSED_ARGUMENTS})
add_llvm_library(${name} COMPONENT_LIB ${ARG_UNPARSED_ARGUMENTS})
string(REGEX REPLACE "^LLVM" "" component_name ${name})
set_property(TARGET ${name} PROPERTY LLVM_COMPONENT_NAME ${component_name})

4
llvm/tools/llvm-shlib/CMakeLists.txt
View File

@ -33,10 +33,6 @@ if(LLVM_BUILD_LLVM_DYLIB)
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
list(REMOVE_DUPLICATES LIB_NAMES)
# Link against the object libraries instead of static libraries.
list(TRANSFORM LIB_NAMES PREPEND "obj.")
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")