diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -27,6 +27,9 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) + message(FATAL_ERROR "The Standalone build has been deprecated since LLVM 14, and it is not supported anymore. " + "Please use one of the ways described at https://libcxx.llvm.org/BuildingLibcxx.html for " + "building libc++.") project(libcxx CXX C) set(PACKAGE_NAME libcxx) diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst --- a/libcxx/docs/ReleaseNotes.rst +++ b/libcxx/docs/ReleaseNotes.rst @@ -51,3 +51,7 @@ Build System Changes -------------------- + +- Support for standalone builds have been entirely removed from libc++, libc++abi and + libunwind. Please use `these instructions `_ + for building libc++, libc++abi and/or libunwind. diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -297,19 +297,6 @@ limit: 2 timeout_in_minutes: 120 - - label: "Legacy standalone build" - command: "libcxx/utils/ci/run-buildbot legacy-standalone" - artifact_paths: - - "**/test-results.xml" - agents: - queue: "libcxx-builders" - os: "linux" - retry: - automatic: - - exit_status: -1 # Agent was lost - limit: 2 - timeout_in_minutes: 120 - - label: "Legacy LLVM_ENABLE_PROJECTS build" command: "libcxx/utils/ci/run-buildbot legacy-project-build" artifact_paths: diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -516,48 +516,6 @@ -DLIBCXX_CXX_ABI=libcxxabi check-runtimes ;; -legacy-standalone) - clean - - echo "--- Generating CMake" - ${CMAKE} \ - -S "${MONOREPO_ROOT}/libcxx" \ - -B "${BUILD_DIR}/libcxx" \ - -GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -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" - - ${CMAKE} \ - -S "${MONOREPO_ROOT}/libcxxabi" \ - -B "${BUILD_DIR}/libcxxabi" \ - -GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ - -DLLVM_PATH="${MONOREPO_ROOT}/llvm" \ - -DLIBCXXABI_LIBCXX_PATH="${MONOREPO_ROOT}/libcxx" \ - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}/libcxx/include/c++/v1" \ - -DLIBCXXABI_LIBCXX_LIBRARY_PATH="${BUILD_DIR}/libcxx/lib" - - echo "+++ Generating libc++ headers" - ${NINJA} -vC "${BUILD_DIR}/libcxx" generate-cxx-headers - - echo "+++ Building libc++abi" - ${NINJA} -vC "${BUILD_DIR}/libcxxabi" cxxabi - - echo "+++ Building libc++" - ${NINJA} -vC "${BUILD_DIR}/libcxx" cxx - - echo "+++ Running the libc++ tests" - ${NINJA} -vC "${BUILD_DIR}/libcxx" check-cxx - - echo "+++ Running the libc++abi tests" - ${NINJA} -vC "${BUILD_DIR}/libcxxabi" check-cxxabi -;; aarch64) clean generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" \ diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -28,6 +28,10 @@ "Specify path to libc++ source.") if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) + message(FATAL_ERROR "The Standalone build has been deprecated since LLVM 14, and it is not supported anymore. " + "Please use one of the ways described at https://libcxx.llvm.org/BuildingLibcxx.html for " + "building libc++abi.") + project(libcxxabi CXX C) set(PACKAGE_NAME libcxxabi) diff --git a/libcxxabi/www/index.html b/libcxxabi/www/index.html --- a/libcxxabi/www/index.html +++ b/libcxxabi/www/index.html @@ -73,51 +73,7 @@

Get it and get involved!

-

To check out the code (including llvm and others), use:

- - - -

To build:

- - -

To do a standalone build:

- -

By default CMake uses llvm-config to locate the required - LLVM sources. If CMake cannot find llvm-config then you must - configure CMake using either of the following options. -

- - -

- -

To run the tests:

- -

Note: in a standalone build, the system's libc++ will be used for tests. If - the system's libc++ was statically linked against libc++abi (or linked against - a different ABI library), this may interfere with test results.

- -

Send discussions to the - (libcxx-dev mailing list).

+

Please see the libc++ documentation.

Frequently asked questions

diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -24,6 +24,10 @@ "Specify path to libc++ source.") if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) + message(FATAL_ERROR "The Standalone build has been deprecated since LLVM 14, and it is not supported anymore. " + "Please use one of the ways described at https://libcxx.llvm.org/BuildingLibcxx.html for " + "building libunwind.") + # We may have an incomplete toolchain - do language support tests without # linking. include(EnableLanguageNolink)