From d6777207b4fd4868a4409cc39936156ec3aa3c50 Mon Sep 17 00:00:00 2001 From: Xin-Xin Wang Date: Mon, 16 Dec 2019 16:08:07 -0800 Subject: [PATCH] [llvm/runtimes] Add runtimes as a dependency of clang-bootstrap-deps Summary: With the new LLVM_ENABLE_RUNTIMES option introduced in https://reviews.llvm.org/D40233, compiler-rt can now be included as a runtime. Since compiler-rt is needed for PGO, runtimes needs to be included as a dependency of clang-bootstrap-deps when building the stage1 compiler. Reviewers: beanz, phosek, compnerd, smeenai, plotfi, xiaobai Reviewed By: phosek Subscribers: smeenai, beanz, phosek, mgorny, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D71430 --- llvm/runtimes/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 1b9c4f0..f29d601 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -555,13 +555,16 @@ else() # if this is included from LLVM's CMake endforeach() endif() - # TODO: This is a hack needed because the libcxx headers are copied into the - # build directory during configuration. Without that step the clang in the - # build directory cannot find the C++ headers in certain configurations. - # I need to build a mechanism for runtime projects to provide CMake code - # that executes at LLVM configuration time to handle this case. if(NOT LLVM_BUILD_INSTRUMENTED AND CLANG_ENABLE_BOOTSTRAP) + # TODO: This is a hack needed because the libcxx headers are copied into the + # build directory during configuration. Without that step the clang in the + # build directory cannot find the C++ headers in certain configurations. + # I need to build a mechanism for runtime projects to provide CMake code + # that executes at LLVM configuration time to handle this case. add_dependencies(clang-bootstrap-deps runtimes-configure) + # We need to add the runtimes as a dependency because compiler-rt can be + # built as part of runtimes and we need the profile runtime for PGO + add_dependencies(clang-bootstrap-deps runtimes) endif() if(LLVM_INCLUDE_TESTS) -- 2.7.4