diff options
| author | Ahmed Bougacha <ahmed.bougacha@gmail.com> | 2018-06-28 18:35:25 +0000 |
|---|---|---|
| committer | Ahmed Bougacha <ahmed.bougacha@gmail.com> | 2018-06-28 18:35:25 +0000 |
| commit | 8b597883a1893c32f5cf89053b7855b9c9322b4c (patch) | |
| tree | 7688118fde09d3c2bd3bb2bcaa1383c8bcbfc87c /clang/runtime/CMakeLists.txt | |
| parent | 197e73fede5589bc53735dc94f3c42c0dedc1daf (diff) | |
| download | llvm-project-8b597883a1893c32f5cf89053b7855b9c9322b4c.tar.gz | |
[CMake] Make bootstrap and compiler-rt depend on cxx-headers.
Since r334468, we no longer always copy the libcxx headers by virtue of
their presence when cmake runs.
This makes some of the later stages (compiler-rt, and the bootstrapped
stages) depend on them being copied, via the cxx-headers target.
Differential Revision: https://reviews.llvm.org/D48700
llvm-svn: 335898
Diffstat (limited to 'clang/runtime/CMakeLists.txt')
| -rw-r--r-- | clang/runtime/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index af8ab163c7cd..9c2f5cd9cf12 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -58,8 +58,12 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) endif() endforeach() + if(TARGET cxx-headers) + set(COMPILER_RT_LIBCXX_DEPENDENCY "cxx-headers") + endif() + ExternalProject_Add(compiler-rt - DEPENDS llvm-config clang + DEPENDS llvm-config clang ${COMPILER_RT_LIBCXX_DEPENDENCY} PREFIX ${COMPILER_RT_PREFIX} SOURCE_DIR ${COMPILER_RT_SRC_ROOT} STAMP_DIR ${STAMP_DIR} |