diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-08-29 20:18:52 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-08-29 20:18:52 +0000 |
| commit | ed9abbea865c6a790733792da6b00f4ea7c66a5b (patch) | |
| tree | e38bf42dd018c8fef2c275b20d030ce71da4e6c0 | |
| parent | df19502b16b59fd6ccfda2ee4a3afa99af31682e (diff) | |
| download | bcm5719-llvm-ed9abbea865c6a790733792da6b00f4ea7c66a5b.tar.gz bcm5719-llvm-ed9abbea865c6a790733792da6b00f4ea7c66a5b.zip | |
[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.
llvm-svn: 280002
| -rw-r--r-- | llvm/runtimes/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 4d0747680a4..a787fc9b5b7 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/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) |
