Skip to content

Commit 0a00a7d

Browse files
committed
[libc++] Use generator expression in Linker script generation
This is an alternative to the workaround in 34a3b24. Differential Revision: https://reviews.llvm.org/D68880
1 parent 6a043ec commit 0a00a7d

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

libcxx/cmake/Modules/DefineLinkerScript.cmake

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ function(define_linker_script target)
3434
if ("${lib}" STREQUAL "cxx-headers")
3535
continue()
3636
endif()
37-
if (TARGET "${lib}" OR
38-
(${lib} MATCHES "cxxabi(_static|_shared)?" AND HAVE_LIBCXXABI) OR
39-
(${lib} MATCHES "unwind(_static|_shared)?" AND HAVE_LIBUNWIND))
40-
list(APPEND link_libraries "${CMAKE_LINK_LIBRARY_FLAG}$<TARGET_PROPERTY:${lib},OUTPUT_NAME>")
41-
else()
42-
list(APPEND link_libraries "${CMAKE_LINK_LIBRARY_FLAG}${lib}")
43-
endif()
37+
set(libname "$<IF:$<TARGET_EXISTS:${lib}>,$<TARGET_PROPERTY:${lib},OUTPUT_NAME>,${lib}>")
38+
list(APPEND link_libraries "${CMAKE_LINK_LIBRARY_FLAG}${libname}")
4439
endforeach()
4540
endif()
4641
string(REPLACE ";" " " link_libraries "${link_libraries}")

0 commit comments

Comments
 (0)