[libcxx-commits] [PATCH] D113503: [libc++] Disallow running the libc++ benchmarks in standalone builds

[Louis Dionne via Phabricator via libcxx-commits]

ldionne created this revision.
Herald added subscribers: arichardson, mgorny.
ldionne requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D113503

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


Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -526,6 +526,7 @@
           -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"
 
Index: libcxx/benchmarks/CMakeLists.txt
===================================================================
--- libcxx/benchmarks/CMakeLists.txt
+++ libcxx/benchmarks/CMakeLists.txt
@@ -3,6 +3,12 @@
   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)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D113503.385914.patch
Type: text/x-patch
Size: 1069 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20211109/e242a6e7/attachment.bin>