LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont required CMake 3 to install a linker script

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@251065 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2015-10-22 21:24:01 +00:00
parent 1cf5a81b89
commit 601d2c1165
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CMakeLists.txt
View File

@@ -154,7 +154,6 @@ if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
) )
endif() endif()
if (LIBCXX_INSTALL_LIBRARY) if (LIBCXX_INSTALL_LIBRARY)
install(TARGETS cxx install(TARGETS cxx
LIBRARY DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx 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 # NOTE: This install command must go after the cxx install command otherwise
# it will not be executed after the library symlinks are installed. # it will not be executed after the library symlinks are installed.
if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT) 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} DESTINATION lib${LIBCXX_LIBDIR_SUFFIX}
COMPONENT libcxx) COMPONENT libcxx)
endif() endif()