diff options
| author | Mircea Trofin <mtrofin@google.com> | 2021-11-16 16:35:06 -0800 |
|---|---|---|
| committer | Mircea Trofin <mtrofin@google.com> | 2021-11-16 16:35:06 -0800 |
| commit | b2fbd45d2395f1f6ef39db72b7156724fc101e40 (patch) | |
| tree | 7f54fa7ed22185b5f6936de731003c6e511b68ec /runtimes | |
| parent | 93bf271f27439d133616815266b50db4a294e118 (diff) | |
| download | llvm-b2fbd45d2395f1f6ef39db72b7156724fc101e40.zip llvm-b2fbd45d2395f1f6ef39db72b7156724fc101e40.tar.gz llvm-b2fbd45d2395f1f6ef39db72b7156724fc101e40.tar.bz2 | |
Revert "Reland "[benchmarks] Move libcxx's fork of google/benchmark and llvm/utils'"""
This reverts commit 1ee32055ea1dd4db70d1939cbd4f5105c2dce160.
We hit additional bot failures; in particular, Fuchsia's seems to be
related to how CMakeLists are ingested, see https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-linux-x64/b8830380874445931681/overview
Diffstat (limited to 'runtimes')
| -rw-r--r-- | runtimes/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 2989057c..29eb675 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -43,7 +43,13 @@ endfunction() find_package(LLVM PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) find_package(Clang PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -set(LLVM_THIRD_PARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../third-party") +# Add path for custom and the LLVM build's modules to the CMake module path. +list(INSERT CMAKE_MODULE_PATH 0 + "${CMAKE_CURRENT_SOURCE_DIR}/cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" + "${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake/modules" +) function(get_compiler_rt_path path) foreach(entry ${runtimes}) |