[libcxx-commits] [libcxx] 980c7f3 - [libc++] Remove the ad-hoc "unified standalone" build

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-10-08T10:57:40-04:00
New Revision: 980c7f32490b1e218d13abd9a84deeddfc3cd9a9

URL: https://github.com/llvm/llvm-project/commit/980c7f32490b1e218d13abd9a84deeddfc3cd9a9
DIFF: https://github.com/llvm/llvm-project/commit/980c7f32490b1e218d13abd9a84deeddfc3cd9a9.diff

LOG: [libc++] Remove the ad-hoc "unified standalone" build

It is not used anywhere anymore since we're using the new runtimes build
in <monorepo>/runtimes now, so we can remove all traces of this build.

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

Added: 
    

Modified: 
    libcxx/utils/ci/apple-install-libcxx.sh
    libcxx/utils/ci/buildkite-pipeline.yml
    libcxx/utils/ci/run-buildbot

Removed: 
    libcxx/utils/ci/runtimes/CMakeLists.txt


################################################################################
diff  --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh
index c9f813fb98786..aa5457718687a 100755
--- a/libcxx/utils/ci/apple-install-libcxx.sh
+++ b/libcxx/utils/ci/apple-install-libcxx.sh
@@ -112,10 +112,10 @@ for arch in ${architectures}; do
     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/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 31e88ed5d5438..08b4d3cc079fe 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -267,19 +267,6 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Unified standalone build"
-    command: "libcxx/utils/ci/run-buildbot unified-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: "New standalone runtimes build"
     command: "libcxx/utils/ci/run-buildbot new-standalone"
     artifact_paths:

diff  --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 2ddfa1282296a..a3e6b781ce23e 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -411,21 +411,6 @@ documentation)
     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
index 9771172b6e0af..0000000000000
--- 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")