mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 10:39:01 +08:00
40449ff1cb
* fix issue #16215 * add more projects and fix issue #16222 * add version * exclude libc from default projects * remove libc, add fland to default projects * update to v11.1.0 * fix compiler-rt install path * fix SHA for version 11.1.0 * fix libc++ install * re-fix libc++ install * fix pstl install * fix flang's license file name * install tools in tools/llvm, fix file names * revert bin directory for libraries * don't create clang sub-directory in llvm/tools * overwrite version * copy tool dependencies * overwrite version * remove vcpkg_copy_tools call * overwrite version * restore default features * overwrite version * overwrite version * convert manifest to json * install usage files * overwrite version * remove feature `default-projects` * modernize CMake in usage files * overwrite version * update ordering * override version
19 lines
865 B
Diff
19 lines
865 B
Diff
libcxx/src/CMakeLists.txt | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
|
|
index 2001c09761d9..e17de934534f 100644
|
|
--- a/libcxx/src/CMakeLists.txt
|
|
+++ b/libcxx/src/CMakeLists.txt
|
|
@@ -364,9 +364,7 @@ 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_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
|
|
- # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
|
|
- # after we required CMake 3.0.
|
|
- install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
|
+ install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
|
|
DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR}
|
|
COMPONENT libcxx)
|
|
endif()
|