Skip to content

Commit 6808e6c

Browse files
ldionneldionne
authored
[libc++] Enable Clang modules in carve-out CI jobs (#100571)
This speeds up the CI a bit (anecdotally ~10%) for those jobs, and it also helps ensure that we are clean w.r.t. Clang modules when we disable some of the carve-outs like no-localization or no-threads.
1 parent a482224 commit 6808e6c

12 files changed

+42
-0
lines changed

‎libcxx/cmake/caches/Generic-no-exceptions.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
22
set(LIBCXXABI_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
3+
4+
# Speed up the CI
5+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
6+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-experimental.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
set(LIBCXX_TEST_PARAMS "enable_experimental=False" CACHE STRING "")
22
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")
3+
4+
# Speed up the CI
5+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
6+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-filesystem.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")
2+
3+
# Speed up the CI
4+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
5+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-localization.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
set(LIBCXX_ENABLE_LOCALIZATION OFF CACHE BOOL "")
2+
3+
# Speed up the CI
4+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
5+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-random_device.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
set(LIBCXX_ENABLE_RANDOM_DEVICE OFF CACHE BOOL "")
2+
3+
# Speed up the CI
4+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
5+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-rtti.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ set(LIBCXX_ENABLE_RTTI OFF CACHE BOOL "")
22
set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
33
set(LIBCXXABI_ENABLE_RTTI OFF CACHE BOOL "")
44
set(LIBCXXABI_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
5+
6+
# Speed up the CI
7+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
8+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-threads.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "")
22
set(LIBCXXABI_ENABLE_THREADS OFF CACHE BOOL "")
33
set(LIBCXX_ENABLE_MONOTONIC_CLOCK OFF CACHE BOOL "")
4+
5+
# Speed up the CI
6+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
7+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-tzdb.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
set(LIBCXX_ENABLE_TIME_ZONE_DATABASE OFF CACHE BOOL "")
2+
3+
# Speed up the CI
4+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
5+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-unicode.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
set(LIBCXX_ENABLE_UNICODE OFF CACHE BOOL "")
2+
3+
# Speed up the CI
4+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
5+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/cmake/caches/Generic-no-wide-characters.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "")
2+
3+
# Speed up the CI
4+
set(LIBCXX_TEST_PARAMS "enable_modules=clang" CACHE STRING "")
5+
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

‎libcxx/include/__thread/thread.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#ifndef _LIBCPP___THREAD_THREAD_H
1111
#define _LIBCPP___THREAD_THREAD_H
1212

13+
#include <__assert>
1314
#include <__condition_variable/condition_variable.h>
1415
#include <__config>
1516
#include <__exception/terminate.h>

‎libcxx/test/std/atomics/atomics.ref/required_alignment.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <atomic>
1313
#include <cassert>
1414
#include <concepts>
15+
#include <cstddef>
1516

1617
template <typename T>
1718
constexpr void check_required_alignment() {

0 commit comments

Comments
 (0)