diff options
| author | Logan Chien <tzuhsiang.chien@gmail.com> | 2016-10-03 11:08:17 +0000 |
|---|---|---|
| committer | Logan Chien <tzuhsiang.chien@gmail.com> | 2016-10-03 11:08:17 +0000 |
| commit | 78d8ac368f6ed0ce530d0ee7dd6e5143cd51c20d (patch) | |
| tree | 02c3374b9cc4dd116b66dd256e6c6defadfdd842 /libcxxabi | |
| parent | 1c38681ae643430a11738414f70c68ad93c48eb4 (diff) | |
| download | bcm5719-llvm-78d8ac368f6ed0ce530d0ee7dd6e5143cd51c20d.tar.gz bcm5719-llvm-78d8ac368f6ed0ce530d0ee7dd6e5143cd51c20d.zip | |
[CMake] Fix libc++abi standalone cmake build.
The cmake files install directory has been changed to
${prefix}/lib/cmake/llvm since r259821. Searching cmake modules in
${prefix}/share/llvm/cmake will result in fatal errors.
This commit fixes the out-of-tree build by changing the CMake module
search path to: "$(llvm-config --obj-root)/lib/cmake/llvm"
llvm-svn: 283100
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index a33cf48f2ba..e75c0b81bb4 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -49,7 +49,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include") set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") - set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake") + set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py") else() message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. " |
