File tree Expand file tree Collapse file tree 7 files changed +17
-1
lines changed Expand file tree Collapse file tree 7 files changed +17
-1
lines changed Original file line number Diff line number Diff line change @@ -146,6 +146,7 @@ jobs:
146
146
' generic-no-experimental' ,
147
147
' generic-no-filesystem' ,
148
148
' generic-no-localization' ,
149
+ ' generic-no-terminal' ,
149
150
' generic-no-random_device' ,
150
151
' generic-no-threads' ,
151
152
' generic-no-tzdb' ,
Original file line number Diff line number Diff line change @@ -97,6 +97,8 @@ option(LIBCXX_ENABLE_UNICODE
97
97
"Whether to include support for Unicode in the library. Disabling Unicode can
98
98
be useful when porting to platforms that don't support UTF-8 encoding (e.g.
99
99
embedded)." ON )
100
+ option (LIBCXX_HAS_TERMINAL_AVAILABLE
101
+ "Build libc++ with support for checking whether a stream is a terminal." ON )
100
102
option (LIBCXX_ENABLE_WIDE_CHARACTERS
101
103
"Whether to include support for wide characters in the library. Disabling
102
104
wide character support can be useful when porting to platforms that don't
@@ -744,6 +746,7 @@ config_define_if(LIBCXX_ABI_FORCE_ITANIUM _LIBCPP_ABI_FORCE_ITANIUM)
744
746
config_define_if(LIBCXX_ABI_FORCE_MICROSOFT _LIBCPP_ABI_FORCE_MICROSOFT)
745
747
config_define_if_not(LIBCXX_ENABLE_THREADS _LIBCPP_HAS_NO_THREADS)
746
748
config_define_if_not(LIBCXX_ENABLE_MONOTONIC_CLOCK _LIBCPP_HAS_NO_MONOTONIC_CLOCK)
749
+ config_define_if_not(LIBCXX_HAS_TERMINAL_AVAILABLE _LIBCPP_HAS_NO_TERMINAL)
747
750
if (NOT LIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION STREQUAL "default" )
748
751
config_define("${LIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION} " _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION)
749
752
endif ()
Original file line number Diff line number Diff line change
1
+ set (LIBCXX_HAS_TERMINAL_AVAILABLE 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 "" )
Original file line number Diff line number Diff line change 15
15
#cmakedefine _LIBCPP_ABI_FORCE_MICROSOFT
16
16
#cmakedefine _LIBCPP_HAS_NO_THREADS
17
17
#cmakedefine _LIBCPP_HAS_NO_MONOTONIC_CLOCK
18
+ #cmakedefine _LIBCPP_HAS_NO_TERMINAL
18
19
#cmakedefine _LIBCPP_HAS_MUSL_LIBC
19
20
#cmakedefine _LIBCPP_HAS_THREAD_API_PTHREAD
20
21
#cmakedefine _LIBCPP_HAS_THREAD_API_EXTERNAL
Original file line number Diff line number Diff line change @@ -199,7 +199,7 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_terminal([[maybe_unused]] FILE* __stream)
199
199
// the behavior in the test. This is not part of the public API.
200
200
# ifdef _LIBCPP_TESTING_PRINT_IS_TERMINAL
201
201
return _LIBCPP_TESTING_PRINT_IS_TERMINAL (__stream);
202
- # elif _LIBCPP_AVAILABILITY_HAS_PRINT == 0
202
+ # elif _LIBCPP_AVAILABILITY_HAS_PRINT == 0 || defined(_LIBCPP_HAS_NO_TERMINAL)
203
203
return false ;
204
204
# elif defined(_LIBCPP_WIN32API)
205
205
return std::__is_windows_terminal (__stream);
Original file line number Diff line number Diff line change @@ -469,6 +469,11 @@ generic-no-localization)
469
469
generate-cmake -C " ${MONOREPO_ROOT} /libcxx/cmake/caches/Generic-no-localization.cmake"
470
470
check-runtimes
471
471
;;
472
+ generic-no-terminal)
473
+ clean
474
+ generate-cmake -C " ${MONOREPO_ROOT} /libcxx/cmake/caches/Generic-no-terminal.cmake"
475
+ check-runtimes
476
+ ;;
472
477
generic-no-unicode)
473
478
clean
474
479
generate-cmake -C " ${MONOREPO_ROOT} /libcxx/cmake/caches/Generic-no-unicode.cmake"
Original file line number Diff line number Diff line change @@ -378,6 +378,7 @@ def _mingwSupportsModules(cfg):
378
378
"_LIBCPP_HAS_NO_FILESYSTEM" : "no-filesystem" ,
379
379
"_LIBCPP_HAS_NO_RANDOM_DEVICE" : "no-random-device" ,
380
380
"_LIBCPP_HAS_NO_LOCALIZATION" : "no-localization" ,
381
+ "_LIBCPP_HAS_NO_TERMINAL" : "no-terminal" ,
381
382
"_LIBCPP_HAS_NO_WIDE_CHARACTERS" : "no-wide-characters" ,
382
383
"_LIBCPP_HAS_NO_TIME_ZONE_DATABASE" : "no-tzdb" ,
383
384
"_LIBCPP_HAS_NO_UNICODE" : "libcpp-has-no-unicode" ,
You can’t perform that action at this time.
0 commit comments