--- a/utils/llvm-lit/CMakeLists.txt	Thu Dec 12 15:22:36 2013 +0900
+++ b/utils/llvm-lit/CMakeLists.txt	Mon Sep 08 22:06:00 2014 +0900
@@ -2,8 +2,20 @@
   # llvm-lit needs suffix.py for multiprocess to find a main module.
   set(suffix .py)
 endif ()
+set(llvm_lit_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-lit${suffix})
 
-configure_file(
-  llvm-lit.in
-  ${LLVM_TOOLS_BINARY_DIR}/llvm-lit${suffix}
-  )
+if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+  foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
+    string(REPLACE ${CMAKE_CFG_INTDIR} ${BUILD_MODE} bi ${llvm_lit_path})
+    configure_file(
+      llvm-lit.in
+      ${bi}
+      )
+  endforeach()
+else()
+  set(BUILD_MODE .)
+  configure_file(
+    llvm-lit.in
+    ${llvm_lit_path}
+    )
+endif()