[libcxx-commits] [libcxx] 4e70b50 - [libc++] Disallow running the libc++ benchmarks in standalone builds

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-11-11T14:13:36-05:00
New Revision: 4e70b50b74dba909f1d8277e26896d9a0d23d428

URL: https://github.com/llvm/llvm-project/commit/4e70b50b74dba909f1d8277e26896d9a0d23d428
DIFF: https://github.com/llvm/llvm-project/commit/4e70b50b74dba909f1d8277e26896d9a0d23d428.diff

LOG: [libc++] Disallow running the libc++ benchmarks in standalone builds

We are trying to remove duplication of third-party code in
https://reviews.llvm.org/D112012, which will move the Google
Benchmark code outside of the `libcxx/` directory. That breaks
running the benchmarks in the Standalone build. Since we have
deprecated the Standalone build anyway, this patch just removes
support for the benchmark in Standalone mode until we remove that
mode entirely.

Differential Revision: https://reviews.llvm.org/D113503

Added: 
    

Modified: 
    libcxx/benchmarks/CMakeLists.txt
    libcxx/utils/ci/run-buildbot

Removed: 
    


################################################################################
diff  --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index 67e643cf8608a..8758c6b7534b0 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -3,6 +3,12 @@ if (CMAKE_VERSION VERSION_LESS 3.17)
   return()
 endif()
 
+if (LIBCXX_STANDALONE_BUILD)
+  message(WARNING "The libc++ benchmarks are not available in a standalone build. Please migrate to an official build "
+                  "as documented in https://libcxx.llvm.org/BuildingLibcxx.html.")
+  return()
+endif()
+
 include(ExternalProject)
 include(CheckCXXCompilerFlag)
 

diff  --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index b36f6d776715d..579721fb0f5a7 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -520,6 +520,7 @@ legacy-standalone)
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
           -DLLVM_PATH="${MONOREPO_ROOT}/llvm" \
           -DLIBCXX_CXX_ABI=libcxxabi \
+          -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
           -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${MONOREPO_ROOT}/libcxxabi/include" \
           -DLIBCXX_CXX_ABI_LIBRARY_PATH="${BUILD_DIR}/libcxxabi/lib"