From 601d2c11650f7a8f3387b93605040382eb3fa8fb Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Thu, 22 Oct 2015 21:24:01 +0000 Subject: [PATCH] Dont required CMake 3 to install a linker script git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@251065 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index ec3085b48..cdba05392 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -154,7 +154,6 @@ if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT) ) endif() - if (LIBCXX_INSTALL_LIBRARY) install(TARGETS cxx LIBRARY DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx @@ -163,7 +162,9 @@ if (LIBCXX_INSTALL_LIBRARY) # NOTE: This install command must go after the cxx install command otherwise # it will not be executed after the library symlinks are installed. if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT) - install(FILES "$" + # Replace the libc++ filename with $ + # after we required CMake 3.0. + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx) endif()