Skip to content

Commit

Permalink
[libc++] Disallow running the libc++ benchmarks in standalone builds
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ldionne committed Nov 11, 2021
1 parent 3016ceb commit 4e70b50
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions libcxx/benchmarks/CMakeLists.txt
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions libcxx/utils/ci/run-buildbot
Expand Up @@ -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"

Expand Down

0 comments on commit 4e70b50

Please sign in to comment.