diff options
| author | Ben Craig <ben.craig@codeaurora.org> | 2016-04-18 13:30:38 +0000 |
|---|---|---|
| committer | Ben Craig <ben.craig@codeaurora.org> | 2016-04-18 13:30:38 +0000 |
| commit | ab56c4041bbf9dc091068fc8c18687734ba1545e (patch) | |
| tree | db46cdeffab590cc6038859cd00a72d2ec0796ae /libcxxabi | |
| parent | f4c1cd4006626ebccdd2a7096bbe2b26bb91097f (diff) | |
| download | bcm5719-llvm-ab56c4041bbf9dc091068fc8c18687734ba1545e.tar.gz bcm5719-llvm-ab56c4041bbf9dc091068fc8c18687734ba1545e.zip | |
Respect LIBCXXABI_LIBDIR_SUFFIX before an install
Prior to this patch, setting LIBCXXABI_LIBDIR_SUFFIX would confuse the
check-libcxxabi target. libc++abi.* would get output to lib instead of
lib${LIBCXXABI_LIBDIR_SUFFIX}, but the tests would look in the suffixed
directory.
Now, we match what libcxx does, and set the CMAKE_*_OUTPUT_DIRECTORY to the
LIBRARY_DIR.
http://reviews.llvm.org/D17410
llvm-svn: 266611
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index d77f7849ea5..9177d43248d 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -96,9 +96,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(LIBCXXABI_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(LIBCXXABI_BUILT_STANDALONE 1) else() set(LLVM_MAIN_SRC_DIR "${CMAKE_SOURCE_DIR}" CACHE PATH "Path to LLVM source tree") @@ -182,6 +179,9 @@ set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXXABI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) + #=============================================================================== # Setup Compiler Flags #=============================================================================== |
