This is an archive of the discontinued LLVM Phabricator instance.

Differential D49765

[CMake] Use LIBCXXABI_LIBDIR_SUFFIX in libc++abi build
ClosedPublic

Authored by phosek on Jul 24 2018, 4:01 PM.

Details

Reviewers
mgorny
EricWF
Commits
rGcbb4313b1ca6: [CMake] Use LIBCXXABI_LIBDIR_SUFFIX in libc++abi build
rCXXA337937: [CMake] Use LIBCXXABI_LIBDIR_SUFFIX in libc++abi build
rL337937: [CMake] Use LIBCXXABI_LIBDIR_SUFFIX in libc++abi build
Summary

This was changed unintentionally in r335809.

Diff Detail

Repository
rCXXA libc++abi

Event Timeline

phosek created this revision.Jul 24 2018, 4:01 PM
Herald added subscribers: cfe-commits, ldionne, christof. · View Herald TranscriptJul 24 2018, 4:01 PM
phosek mentioned this in rCXXA335809: Support for multiarch runtimes layout.Jul 24 2018, 4:02 PM
mgorny accepted this revision.Jul 24 2018, 9:58 PM

Looks good, thanks!

This revision is now accepted and ready to land.Jul 24 2018, 9:58 PM
Closed by commit rL337937: [CMake] Use LIBCXXABI_LIBDIR_SUFFIX in libc++abi build (authored by phosek). · Explain WhyJul 25 2018, 9:51 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 25 2018, 9:51 AM

Revision Contents

PathSize
libcxxabi/
2 lines

Diff 157154

libcxxabi/CMakeLists.txt

Show First 20 Lines • Show All 166 Lines • ▼ Show 20 Linesstring(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION
${PACKAGE_VERSION}) ${PACKAGE_VERSION})
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 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_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/)
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/lib${LIBCXXABI_LIBDIR_SUFFIX}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/lib${LIBCXXABI_LIBDIR_SUFFIX})
elseif(LLVM_LIBRARY_OUTPUT_INTDIR) elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
else() else()
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
endif() endif()
set(LIBCXXABI_INSTALL_PREFIX ${DEFAULT_INSTALL_PREFIX} CACHE STRING set(LIBCXXABI_INSTALL_PREFIX ${DEFAULT_INSTALL_PREFIX} CACHE STRING
"Define libc++abi destination prefix.") "Define libc++abi destination prefix.")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})
▲ Show 20 Lines • Show All 297 Lines • Show Last 20 Lines