From bb6c527ccc13f44d8776ec131547b4143a58824f Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Fri, 21 Jun 2024 08:31:05 +0200 Subject: [PATCH] std_darwin.modulemap: Remove headers for MacOSX15.0.sdk Manually curating the modulemap is far from ideal because it requires updates for changes in the libc++ library shipped with the SDK, which must also work across all supported SDK versions. An alternative would be to locate the modulemap shipped with libc++ during configuration time, copy it and dynamically modify its contents to suit our needs. --- include/cling/std_darwin.modulemap | 56 +----------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/include/cling/std_darwin.modulemap b/include/cling/std_darwin.modulemap index f0f6a6d3..1628b291 100644 --- a/include/cling/std_darwin.modulemap +++ b/include/cling/std_darwin.modulemap @@ -450,10 +450,6 @@ module std_inttypes_h [system] { export * } // provided by compiler. -module std_limits_h [system] { - header "limits.h" - export * -} module std_locale_h [system] { header "locale.h" export * @@ -462,10 +458,7 @@ module std_math_h [system] { header "math.h" export * } -module std_setjmp_h [system] { - header "setjmp.h" - export * -} +// provided by C library. // provided by C library. // FIXME: is missing. // provided by compiler. @@ -522,71 +515,26 @@ module std_wctype_h [system] { // Experimental C++ standard library interfaces module std_experimental [system] { - module deque { - header "experimental/deque" - export * - } - module forward_list { - header "experimental/forward_list" - export * - } module iterator { header "experimental/iterator" export * } - module list { - header "experimental/list" - export * - } - module map { - header "experimental/map" - export * - } - module memory_resource { - header "experimental/memory_resource" - export * - } module propagate_const { header "experimental/propagate_const" export * } - module regex { - - header "experimental/regex" - export * - } module simd { header "experimental/simd" export * } - module set { - header "experimental/set" - export * - } - module string { - header "experimental/string" - export * - } module type_traits { header "experimental/type_traits" export * } - module unordered_map { - header "experimental/unordered_map" - export * - } - module unordered_set { - header "experimental/unordered_set" - export * - } module utility { header "experimental/utility" export * } - module vector { - header "experimental/vector" - export * - } module __config { private textual header "experimental/__config" export * @@ -1983,7 +1931,6 @@ module std_private_type_traits_nat [system module std_private_type_traits_negation [system] { header "__type_traits/negation.h" } module std_private_type_traits_noexcept_move_assign_container [system] { header "__type_traits/noexcept_move_assign_container.h" } module std_private_type_traits_operation_traits [system] { header "__type_traits/operation_traits.h" } -module std_private_type_traits_predicate_traits [system] { header "__type_traits/predicate_traits.h" } module std_private_type_traits_promote [system] { header "__type_traits/promote.h" } module std_private_type_traits_rank [system] { header "__type_traits/rank.h" } module std_private_type_traits_remove_all_extents [system] { header "__type_traits/remove_all_extents.h" } @@ -2056,7 +2003,6 @@ module std_private_utility_swap [system] { header "__utility/swap.h" export std_private_type_traits_is_swappable } -module std_private_utility_terminate_on_exception [system] { header "__utility/terminate_on_exception.h" } module std_private_utility_to_underlying [system] { header "__utility/to_underlying.h" } module std_private_utility_unreachable [system] { header "__utility/unreachable.h" }