[CMake] Builtins build needs LLVM_*_OUTPUT_INTDIR variables

This allows the builtins archives to build into the correct subdirectory under the binary dir. Addresses the issue discussed in D24001. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@280002 91177308-0d34-0410-b5e6-96231b3b80d8
Karbin74 · Aug 29, 2016 · 6aad1fb · 6aad1fb
1 parent 1254de0
commit 6aad1fb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt
@@ -123,6 +123,8 @@ else() # if this is included from LLVM's CMake
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt)
     llvm_ExternalProject_Add(builtins
                              ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/lib/builtins
+                             CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
+                                        -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
                              PASSTHROUGH_PREFIXES COMPILER_RT
                              USE_TOOLCHAIN)
     set(deps builtins)