[libcxx] r251065 - Dont required CMake 3 to install a linker script

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Thu Oct 22 14:24:01 PDT 2015


Author: ericwf
Date: Thu Oct 22 16:24:01 2015
New Revision: 251065

URL: http://llvm.org/viewvc/llvm-project?rev=251065&view=rev
Log:
Dont required CMake 3 to install a linker script

Modified:
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=251065&r1=251064&r2=251065&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Thu Oct 22 16:24:01 2015
@@ -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 "$<TARGET_LINKER_FILE:cxx>"
+    # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
+    # 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()




More information about the cfe-commits mailing list