From 0f26710d0382348917bec724e74cae7a17e5a5f7 Mon Sep 17 00:00:00 2001 From: Ahmed Bougacha Date: Thu, 28 Jun 2018 18:35:25 +0000 Subject: [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 --- clang/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'clang/CMakeLists.txt') diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index ae8835d751c..52b88193949 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -621,10 +621,15 @@ if (CLANG_ENABLE_BOOTSTRAP) LLVM_ENABLE_PROJECTS LLVM_ENABLE_RUNTIMES) - # We don't need to depend on compiler-rt if we're building instrumented + # We don't need to depend on compiler-rt/libcxx if we're building instrumented # because the next stage will use the same compiler used to build this stage. - if(TARGET compiler-rt AND NOT LLVM_BUILD_INSTRUMENTED) - add_dependencies(clang-bootstrap-deps compiler-rt) + if(NOT LLVM_BUILD_INSTRUMENTED) + if(TARGET compiler-rt) + add_dependencies(clang-bootstrap-deps compiler-rt) + endif() + if(TARGET cxx-headers) + add_dependencies(clang-bootstrap-deps cxx-headers) + endif() endif() set(C_COMPILER "clang") -- cgit v1.2.3