Skip to content

Commit 4965b9c

Browse files
mordantetru
authored andcommitted
[libc++] Fixes the Clang modular build.
The patch 430b397 ("[libc++] Granularize <type_traits> includes in <iterator>") missed some exports in the modulemap with became apparent in the reverting commit 12cb1cb. This fixes the issue by updating the modulemap. Note that the Clang ICE is not fixed by this change. Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D142690 (cherry picked from commit a7f8ddc)
1 parent 13eed4a commit 4965b9c

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

libcxx/include/module.modulemap.in

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -755,13 +755,19 @@ module std [system] {
755755
module derived_from { private header "__concepts/derived_from.h" }
756756
module destructible { private header "__concepts/destructible.h" }
757757
module different_from { private header "__concepts/different_from.h" }
758-
module equality_comparable { private header "__concepts/equality_comparable.h" }
758+
module equality_comparable {
759+
private header "__concepts/equality_comparable.h"
760+
export type_traits.common_reference
761+
}
759762
module invocable { private header "__concepts/invocable.h" }
760763
module movable { private header "__concepts/movable.h" }
761764
module predicate { private header "__concepts/predicate.h" }
762765
module regular { private header "__concepts/regular.h" }
763766
module relation { private header "__concepts/relation.h" }
764-
module same_as { private header "__concepts/same_as.h" }
767+
module same_as {
768+
private header "__concepts/same_as.h"
769+
export type_traits.is_same
770+
}
765771
module semiregular { private header "__concepts/semiregular.h" }
766772
module swappable { private header "__concepts/swappable.h" }
767773
module totally_ordered { private header "__concepts/totally_ordered.h" }
@@ -979,7 +985,11 @@ module std [system] {
979985
module back_insert_iterator { private header "__iterator/back_insert_iterator.h" }
980986
module bounded_iter { private header "__iterator/bounded_iter.h" }
981987
module common_iterator { private header "__iterator/common_iterator.h" }
982-
module concepts { private header "__iterator/concepts.h" }
988+
module concepts {
989+
private header "__iterator/concepts.h"
990+
export concepts.equality_comparable
991+
export type_traits.common_reference
992+
}
983993
module counted_iterator { private header "__iterator/counted_iterator.h" }
984994
module data { private header "__iterator/data.h" }
985995
module default_sentinel { private header "__iterator/default_sentinel.h" }

0 commit comments

Comments
 (0)