[CMake] configure_lit_site_cfg: ${SHLIBDIR} should point the build tree.
authorNAKAMURA Takumi <geek4civic@gmail.com>
Sun, 26 Jan 2014 06:18:56 +0000 (06:18 +0000)
committerNAKAMURA Takumi <geek4civic@gmail.com>
Sun, 26 Jan 2014 06:18:56 +0000 (06:18 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200134 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

index f1bed5e7912f9e193b5ad4b4059f419224c73f03..2b985c237e4f32918cc7192e8e76396873a526f8 100644 (file)
@@ -436,11 +436,15 @@ function(configure_lit_site_cfg input output)
     set(LLVM_BUILD_MODE "%(build_mode)s")
   endif ()
 
+  # They below might not be the build tree but provided binary tree.
   set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
   set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})
   string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_TOOLS_BINARY_DIR})
   string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR  ${LLVM_LIBRARY_DIR})
-  string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR       ${LLVM_LIBRARY_DIR})
+
+  # SHLIBDIR points the build tree.
+  string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
+
   set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
   set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED})
   set(SHLIBPATH_VAR ${SHLIBPATH_VAR})