diff options
| author | Mircea Trofin <mtrofin@google.com> | 2021-11-16 09:28:50 -0800 |
|---|---|---|
| committer | Mircea Trofin <mtrofin@google.com> | 2021-11-16 09:28:50 -0800 |
| commit | e7568b68da8a216dc22cdc1c6d8903c94096c846 (patch) | |
| tree | a64f5a5d6394c7b5c104aa6def2dc2d9c937aedf /libcxx/benchmarks | |
| parent | 3dd6d5b62825a558655182a970e9ca3bb90e00c8 (diff) | |
| download | llvm-e7568b68da8a216dc22cdc1c6d8903c94096c846.tar.gz | |
Revert "[benchmarks] Move libcxx's fork of google/benchmark and llvm/utils'"
This reverts commit c6f7b720ecfa6db40c648eb05e319f8a817110e9.
Some buildbots are failing, will investigate and reland.
Example:
https://lab.llvm.org/buildbot#builders/138/builds/14067
https://lab.llvm.org/buildbot#builders/73/builds/20159
Diffstat (limited to 'libcxx/benchmarks')
| -rw-r--r-- | libcxx/benchmarks/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt index cce89ad3c158..8758c6b7534b 100644 --- a/libcxx/benchmarks/CMakeLists.txt +++ b/libcxx/benchmarks/CMakeLists.txt @@ -41,7 +41,7 @@ ExternalProject_Add(google-benchmark-libcxx EXCLUDE_FROM_ALL ON DEPENDS cxx cxx-headers PREFIX benchmark-libcxx - SOURCE_DIR ${LLVM_THIRD_PARTY_DIR}/benchmark + SOURCE_DIR ${LIBCXX_SOURCE_DIR}/utils/google-benchmark INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-libcxx CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} @@ -66,7 +66,7 @@ if (LIBCXX_BENCHMARK_NATIVE_STDLIB) ExternalProject_Add(google-benchmark-native EXCLUDE_FROM_ALL ON PREFIX benchmark-native - SOURCE_DIR ${LLVM_THIRD_PARTY_DIR}/benchmark + SOURCE_DIR ${LIBCXX_SOURCE_DIR}/utils/google-benchmark INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-native CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} |