Skip to content

Commit 9e3490b

Browse files
[𝘀𝗽𝗿] initial version
Created using spr 1.3.4
2 parents 33fae08 + e12b275 commit 9e3490b

16 files changed

+25
-36
lines changed

.ci/monolithic-linux.sh

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -102,51 +102,25 @@ if [[ "${runtimes}" != "" ]]; then
102102
exit 1
103103
fi
104104

105-
echo "--- ninja install-clang"
106-
107-
ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
108-
109-
RUNTIMES_BUILD_DIR="${MONOREPO_ROOT}/build-runtimes"
110-
INSTALL_DIR="${BUILD_DIR}/install"
111-
mkdir -p ${RUNTIMES_BUILD_DIR}
112-
113105
echo "--- cmake runtimes C++26"
114106

115-
rm -rf "${RUNTIMES_BUILD_DIR}"
116-
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
117-
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
118-
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
119-
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
120-
-D LIBCXX_CXX_ABI=libcxxabi \
121-
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
122-
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
123-
-D LIBCXX_TEST_PARAMS="std=c++26" \
124-
-D LIBCXXABI_TEST_PARAMS="std=c++26" \
125-
-D LLVM_LIT_ARGS="${lit_args}"
107+
cmake \
108+
-D LIBCXX_TEST_PARAMS="std=c++26" \
109+
-D LIBCXXABI_TEST_PARAMS="std=c++26" \
110+
"${BUILD_DIR}"
126111

127112
echo "--- ninja runtimes C++26"
128113

129-
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
114+
ninja -C "${BUILD_DIR}" ${runtime_targets}
130115

131116
echo "--- cmake runtimes clang modules"
132117

133-
# We don't need to do a clean build of runtimes, because LIBCXX_TEST_PARAMS
134-
# and LIBCXXABI_TEST_PARAMS only affect lit configuration, which successfully
135-
# propagates without a clean build. Other that those two variables, builds
136-
# are supposed to be the same.
137-
138-
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
139-
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
140-
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
141-
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
142-
-D LIBCXX_CXX_ABI=libcxxabi \
143-
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
144-
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
145-
-D LIBCXX_TEST_PARAMS="enable_modules=clang" \
146-
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
147-
-D LLVM_LIT_ARGS="${lit_args}"
118+
cmake \
119+
-D LIBCXX_TEST_PARAMS="enable_modules=clang" \
120+
-D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
121+
"${BUILD_DIR}"
148122

149123
echo "--- ninja runtimes clang modules"
150124

151-
ninja -vC "${RUNTIMES_BUILD_DIR}" ${runtime_targets}
125+
ninja -C "${BUILD_DIR}" ${runtime_targets}
152126
fi

libcxx/test/libcxx/containers/views/mdspan/extents/assert.conversion.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
// (((Extents != dynamic_extent) && (OtherExtents == dynamic_extent)) || ... ) ||
3131
// (numeric_limits<index_type>::max() < numeric_limits<OtherIndexType>::max())
3232

33+
#include <span> // dynamic_extent
3334
#include <mdspan>
3435
#include <cassert>
3536

libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_array.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
// for every rank index r.
3131
//
3232

33+
#include <span> // dynamic_extent
3334
#include <mdspan>
3435
#include <cassert>
3536

libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_integral.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
// - each element of exts is nonnegative and is representable as a value of type index_type.
3333
//
3434

35+
#include <span> // dynamic_extent
3536
#include <mdspan>
3637
#include <cassert>
3738

libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_span.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
// for every rank index r.
2929
//
3030

31+
#include <span> // dynamic_extent
3132
#include <mdspan>
3233
#include <cassert>
3334

libcxx/test/libcxx/containers/views/mdspan/extents/assert.obs.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
//
2525
// Returns: Di.
2626

27+
#include <span> // dynamic_extent
2728
#include <mdspan>
2829
#include <cassert>
2930

libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.conversion.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
//
2222
// Preconditions: other.required_span_size() is representable as a value of type index_type.
2323

24+
#include <span> // dynamic_extent
2425
#include <mdspan>
2526
#include <cassert>
2627

libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.ctor.extents.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
//
2020
// Effects: Direct-non-list-initializes extents_ with e.
2121

22+
#include <span> // dynamic_extent
2223
#include <mdspan>
2324
#include <cassert>
2425

libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.ctor.layout_right.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
//
2424
// Preconditions: other.required_span_size() is representable as a value of type index_type
2525

26+
#include <span> // dynamic_extent
2627
#include <mdspan>
2728
#include <cassert>
2829

libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.ctor.layout_stride.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
//
3333
// Effects: Direct-non-list-initializes extents_ with other.extents().
3434

35+
#include <span> // dynamic_extent
3536
#include <mdspan>
3637
#include <cassert>
3738

libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.conversion.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
//
2222
// Preconditions: other.required_span_size() is representable as a value of type index_type.
2323

24+
#include <span> // dynamic_extent
2425
#include <mdspan>
2526
#include <cassert>
2627

libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.ctor.extents.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
//
2020
// Effects: Direct-non-list-initializes extents_ with e.
2121

22+
#include <span> // dynamic_extent
2223
#include <mdspan>
2324
#include <cassert>
2425

libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.ctor.layout_left.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
//
2424
// Preconditions: other.required_span_size() is representable as a value of type index_type
2525

26+
#include <span> // dynamic_extent
2627
#include <mdspan>
2728
#include <cassert>
2829

libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.ctor.layout_stride.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
//
3333
// Effects: Direct-non-list-initializes extents_ with other.extents().
3434

35+
#include <span> // dynamic_extent
3536
#include <mdspan>
3637
#include <cassert>
3738

libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.ctor.extents_array.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//
3131
// Effects: Direct-non-list-initializes extents_ with e, and for all d in the range [0, rank_), direct-non-list-initializes strides_[d] with as_const(s[d]).
3232

33+
#include <span> // dynamic_extent
3334
#include <mdspan>
3435
#include <cassert>
3536

libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.ctor.extents_span.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//
3131
// Effects: Direct-non-list-initializes extents_ with e, and for all d in the range [0, rank_), direct-non-list-initializes strides_[d] with as_const(s[d]).
3232

33+
#include <span> // dynamic_extent
3334
#include <mdspan>
3435
#include <cassert>
3536

0 commit comments

Comments
 (0)