diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2014-12-29 12:26:30 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2014-12-29 12:26:30 +0000 |
commit | 7e6f068084bbcc6df3d02f6ca3d7edcd3edcb853 (patch) | |
tree | 92653c988bc7529d9011e58f8c637795eb597e36 | |
parent | 4509c497abf7c1a0448ce281e1041abae097bb74 (diff) | |
download | compiler-rt-7e6f068084bbcc6df3d02f6ca3d7edcd3edcb853.tar.gz |
[cmake/multilib] Support multilib libdir suffixes by applying the
LLVM_LIBDIR_SUFFIX variable to one place in the cmake file.
This is all that I had to do to get everything from compiler-rt working
for me, but there may be more work required if folks are relying on more
parts of compiler-rt. Notably, I'm mostly using it for the sanitizers.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@224928 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 30a7ccd32..8a7bfd849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,8 @@ else() # Get some LLVM variables from LLVMConfig. include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") - set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib) + set(LLVM_LIBRARY_OUTPUT_INTDIR + ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) # Find Python interpreter. set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5) |