Skip to content

Commit b2d4e92

Browse files
committed
[lldb/cmake] Remove special handling of OBJECT libraries
Nothing in lldb sets this. And even if they did, llvm_add_library should know how to handle that.
1 parent b63c1c4 commit b2d4e92

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,29 +100,25 @@ function(add_lldb_library name)
100100
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
101101
endif()
102102

103-
if (PARAM_OBJECT)
104-
add_library(${name} ${libkind} ${srcs})
105-
else()
106-
if(PARAM_ENTITLEMENTS)
107-
set(pass_ENTITLEMENTS ENTITLEMENTS ${PARAM_ENTITLEMENTS})
108-
endif()
103+
if(PARAM_ENTITLEMENTS)
104+
set(pass_ENTITLEMENTS ENTITLEMENTS ${PARAM_ENTITLEMENTS})
105+
endif()
109106

110-
if(LLDB_NO_INSTALL_DEFAULT_RPATH)
111-
set(pass_NO_INSTALL_RPATH NO_INSTALL_RPATH)
112-
endif()
107+
if(LLDB_NO_INSTALL_DEFAULT_RPATH)
108+
set(pass_NO_INSTALL_RPATH NO_INSTALL_RPATH)
109+
endif()
113110

114-
llvm_add_library(${name} ${libkind} ${srcs}
115-
LINK_LIBS ${PARAM_LINK_LIBS}
116-
DEPENDS ${PARAM_DEPENDS}
117-
${pass_ENTITLEMENTS}
118-
${pass_NO_INSTALL_RPATH}
119-
)
111+
llvm_add_library(${name} ${libkind} ${srcs}
112+
LINK_LIBS ${PARAM_LINK_LIBS}
113+
DEPENDS ${PARAM_DEPENDS}
114+
${pass_ENTITLEMENTS}
115+
${pass_NO_INSTALL_RPATH}
116+
)
120117

121-
if(CLANG_LINK_CLANG_DYLIB)
122-
target_link_libraries(${name} PRIVATE clang-cpp)
123-
else()
124-
target_link_libraries(${name} PRIVATE ${PARAM_CLANG_LIBS})
125-
endif()
118+
if(CLANG_LINK_CLANG_DYLIB)
119+
target_link_libraries(${name} PRIVATE clang-cpp)
120+
else()
121+
target_link_libraries(${name} PRIVATE ${PARAM_CLANG_LIBS})
126122
endif()
127123

128124
# A target cannot be changed to a FRAMEWORK after calling install() because

0 commit comments

Comments
 (0)