commit 56dd7238c9745e7cd70cc90cf75519341f41d206
author Martin Storsjo <martin@martin.st> Tue Apr 09 14:31:09 2019 +0000
committer Martin Storsjo <martin@martin.st> Tue Apr 09 14:31:09 2019 +0000
tree b1d5c6978d8718623d74f45965c0b33242ed2322
parent 9f8a406c0eab79ec3ec417b33088e6813dcb296d

[CMake] Fix statically linking in libcxxabi if built separately

In this case, CMake doesn't know about the c++abi target within the
same CMake run.

This reverts this aspect back to how it was before SVN r357811.

Differential Revision: https://reviews.llvm.org/D60448

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@358009 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CMakeLists.txt

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 92606fe..b3eb5c8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -174,9 +174,9 @@
   # Link against libc++abi
   if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
     if (APPLE)
-      target_link_libraries(cxx_shared PRIVATE "-Wl,-force_load" "$<TARGET_LINKER_FILE:${LIBCXX_CXX_STATIC_ABI_LIBRARY}>")
+      target_link_libraries(cxx_shared PRIVATE "-Wl,-force_load" "${LIBCXX_CXX_STATIC_ABI_LIBRARY}")
     else()
-      target_link_libraries(cxx_shared PRIVATE "-Wl,--whole-archive,-Bstatic" "$<TARGET_LINKER_FILE:${LIBCXX_CXX_STATIC_ABI_LIBRARY}>" "-Wl,-Bdynamic,--no-whole-archive")
+      target_link_libraries(cxx_shared PRIVATE "-Wl,--whole-archive,-Bstatic" "${LIBCXX_CXX_STATIC_ABI_LIBRARY}" "-Wl,-Bdynamic,--no-whole-archive")
     endif()
   else()
     target_link_libraries(cxx_shared PRIVATE "${LIBCXX_CXX_SHARED_ABI_LIBRARY}")