Skip to content

Commit 052a4b5

Browse files
[CI] Clean up runtimes builds (#131913)
This patch cleans up the runtimes build in premerge due to queuing delays, dropping the C++03 testing, but keeping the C++20 and Modules configurations as they are deemed important by clang contributors. This patch also makes it easier in the future when we need to rework the runtimes build to anticipate the deprecation of building most of the runtimes with LLVM_ENABLE_PROJECTS.
1 parent bf5648a commit 052a4b5

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

.ci/monolithic-linux.sh

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,6 @@ if [[ "${runtimes}" != "" ]]; then
9090
INSTALL_DIR="${BUILD_DIR}/install"
9191
mkdir -p ${RUNTIMES_BUILD_DIR}
9292

93-
echo "--- cmake runtimes C++03"
94-
95-
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
96-
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
97-
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
98-
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
99-
-D LIBCXX_CXX_ABI=libcxxabi \
100-
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
101-
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
102-
-D LIBCXX_TEST_PARAMS="std=c++03" \
103-
-D LIBCXXABI_TEST_PARAMS="std=c++03" \
104-
-D LLVM_LIT_ARGS="${lit_args}"
105-
106-
echo "--- ninja runtimes C++03"
107-
108-
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
109-
11093
echo "--- cmake runtimes C++26"
11194

11295
rm -rf "${RUNTIMES_BUILD_DIR}"
@@ -140,6 +123,6 @@ if [[ "${runtimes}" != "" ]]; then
140123
-D LLVM_LIT_ARGS="${lit_args}"
141124

142125
echo "--- ninja runtimes clang modules"
143-
126+
144127
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
145128
fi

0 commit comments

Comments
 (0)