[PATCH] D59013: [CMake][runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/

Shoaib Meenai via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Thu Mar 7 00:01:32 PST 2019


smeenai accepted this revision.
smeenai added a comment.
This revision is now accepted and ready to land.

LGTM, thanks!



================
Comment at: libcxx/CMakeLists.txt:420-421
 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
-  set(DEFAULT_INSTALL_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/)
-  set(DEFAULT_INSTALL_HEADER_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/)
-  set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/lib${LIBCXX_LIBDIR_SUFFIX})
----------------
These two variables are unused now, right? (and their equivalents in libcxxabi and libunwind)


================
Comment at: libcxx/CMakeLists.txt:424-425
+  if(LIBCXX_LIBDIR_SUBDIR)
+    set(LIBCXX_LIBRARY_DIR ${LIBCXX_LIBRARY_DIR}/${LIBCXX_LIBDIR_SUBDIR})
+    set(LIBCXX_INSTALL_LIBRARY_DIR ${LIBCXX_INSTALL_LIBRARY_DIR}/${LIBCXX_LIBDIR_SUBDIR})
+  endif()
----------------
`string(APPEND)` could be used here – I don't know why that's so uncommon (I only see one instance of it in the entirety of llvm-project right now).


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D59013/new/

https://reviews.llvm.org/D59013





More information about the cfe-commits mailing list