diff --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh --- a/libcxx/utils/ci/apple-install-libcxx.sh +++ b/libcxx/utils/ci/apple-install-libcxx.sh @@ -112,10 +112,10 @@ step "Building libc++.dylib and libc++abi.dylib for architecture ${arch}" mkdir -p "${build_dir}/${arch}" (cd "${build_dir}/${arch}" && - xcrun --sdk "${sdk}" cmake "${llvm_root}/libcxx/utils/ci/runtimes" \ + xcrun --sdk "${sdk}" cmake "${llvm_root}/runtimes" \ -GNinja \ -DCMAKE_MAKE_PROGRAM="$(xcrun --sdk "${sdk}" --find ninja)" \ - -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \ -C "${llvm_root}/libcxx/cmake/caches/Apple.cmake" \ -DCMAKE_INSTALL_PREFIX="${build_dir}/${arch}-install" \ -DCMAKE_INSTALL_NAME_DIR="/usr/lib" \ 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 @@ -418,21 +418,6 @@ echo "+++ Generating documentation" ${NINJA} -vC "${BUILD_DIR}" docs-libcxx-html ;; -unified-standalone) - clean - - echo "--- Generating CMake" - ${CMAKE} \ - -S "${MONOREPO_ROOT}/libcxx/utils/ci/runtimes" \ - -B "${BUILD_DIR}" \ - -GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ - -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi;libunwind" \ - -DLIBCXX_TEST_CONFIG="llvm-libc++-shared.cfg.in" - - check-runtimes -;; new-standalone) clean diff --git a/libcxx/utils/ci/runtimes/CMakeLists.txt b/libcxx/utils/ci/runtimes/CMakeLists.txt deleted file mode 100644 --- a/libcxx/utils/ci/runtimes/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -cmake_minimum_required(VERSION 3.13.4) -project(LLVM_RUNTIMES C CXX ASM) - -find_package(Python3 COMPONENTS Interpreter) -if(NOT Python3_Interpreter_FOUND) - message(WARNING "Python3 not found, using python2 as a fallback") - find_package(Python2 COMPONENTS Interpreter REQUIRED) - if(Python2_VERSION VERSION_LESS 2.7) - message(SEND_ERROR "Python 2.7 or newer is required") - endif() - - # Treat python2 as python3 - add_executable(Python3::Interpreter IMPORTED) - set_target_properties(Python3::Interpreter PROPERTIES - IMPORTED_LOCATION ${Python2_EXECUTABLE}) - set(Python3_EXECUTABLE ${Python2_EXECUTABLE}) -endif() - -# This needs to be set before we add any Lit target for `add_lit_target` to -# select the right Lit to run the tests. -set(LLVM_LIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") - -# Automatically define a few variables that are normally set globally by LLVM. -# This is to keep some amount of similarity between the global LLVM build and -# this minimal build. -set(LLVM_UMBRELLA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..") -list(APPEND CMAKE_MODULE_PATH "${LLVM_UMBRELLA_ROOT}/libcxx/cmake/Modules") -include(HandleOutOfTreeLLVM) - -# Override the external Lit to make sure we use the one we generate below. -# TODO: We can remove this once we start relying on the in-tree version of Lit -# in HandleOutOfTreeLLVM. -set(LLVM_DEFAULT_EXTERNAL_LIT "") - -# Include individual runtime projects -set(LLVM_ENABLE_PROJECTS "" CACHE STRING "Semicolon-separated list of runtimes to build.") -foreach(project IN LISTS LLVM_ENABLE_PROJECTS) - add_subdirectory("${LLVM_UMBRELLA_ROOT}/${project}" "${CMAKE_CURRENT_BINARY_DIR}/${project}") -endforeach() - -# Generate the llvm-lit wrapper, needed for testing. This must be done after -# the projects have been added, since the wraper is only generated correctly -# if the test suites have already been added with add_lit_target. -add_subdirectory("${LLVM_UMBRELLA_ROOT}/llvm/utils/llvm-lit" "${CMAKE_CURRENT_BINARY_DIR}/llvm-lit")