summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2014-12-29 12:26:30 +0000
committerChandler Carruth <chandlerc@gmail.com>2014-12-29 12:26:30 +0000
commit11fb7a49aec01bacacbb7be596e580cf3d24c55c (patch)
tree11fab355e2c96debc9668038ec842f8b5000b74f
parent24a6b05680c2f428272350ae63918f119069636c (diff)
downloadbcm5719-llvm-11fb7a49aec01bacacbb7be596e580cf3d24c55c.tar.gz
bcm5719-llvm-11fb7a49aec01bacacbb7be596e580cf3d24c55c.zip
[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. llvm-svn: 224928
-rw-r--r--compiler-rt/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 30a7ccd32fd..8a7bfd849a1 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/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)
OpenPOWER on IntegriCloud