[PATCH] D24001: [CMake] Use top-level CMake file when building compiler-rt builtins

[Petr Hosek via llvm-commits]

phosek created this revision.
phosek added a reviewer: beanz.
phosek added a subscriber: llvm-commits.
phosek set the repository for this revision to rL LLVM.
Herald added a subscriber: dberris.

Using compiler-rt/lib/builtins CMake file to build builtins forces compiler-rt CMake build to assume that it is being built as standalone which results in builtins being installed in the library directory instead of Clang resource directory as it does when compiler-rt is built from within projects. Using top-level CMake file to build compiler-rt builtins solves this issue.

Repository:
  rL LLVM

https://reviews.llvm.org/D24001

Files:
  runtimes/CMakeLists.txt

Index: runtimes/CMakeLists.txt
===================================================================
--- runtimes/CMakeLists.txt
+++ runtimes/CMakeLists.txt
@@ -122,7 +122,8 @@
   # before the just-built compiler can pass the configuration tests.
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt)
     llvm_ExternalProject_Add(builtins
-                             ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/lib/builtins
+                             ${CMAKE_CURRENT_SOURCE_DIR}
+                             CMAKE_ARGS -DCOMPILER_RT_BUILD_SANITIZERS=Off
                              PASSTHROUGH_PREFIXES COMPILER_RT
                              USE_TOOLCHAIN)
     set(deps builtins)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24001.69603.patch
Type: text/x-patch
Size: 687 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160829/c24c5552/attachment.bin>