diff options
Diffstat (limited to 'include/clang/module.modulemap')
-rw-r--r-- | include/clang/module.modulemap | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/include/clang/module.modulemap b/include/clang/module.modulemap index 03806016cc48..5058d15025d8 100644 --- a/include/clang/module.modulemap +++ b/include/clang/module.modulemap @@ -39,6 +39,7 @@ module Clang_Basic { exclude header "Basic/BuiltinsR600.def" exclude header "Basic/BuiltinsX86.def" exclude header "Basic/BuiltinsXCore.def" + exclude header "Basic/BuiltinsLe64.def" exclude header "Basic/DiagnosticOptions.def" exclude header "Basic/LangOptions.def" exclude header "Basic/OpenCLExtensions.def" @@ -47,9 +48,6 @@ module Clang_Basic { exclude header "Basic/Sanitizers.def" exclude header "Basic/TokenKinds.def" - // This file is one big layering violation. - exclude header "Basic/AllDiagnostics.h" - // This file includes a header from Lex. exclude header "Basic/PlistSupport.h" @@ -62,6 +60,24 @@ module Clang_Basic { module Clang_CodeGen { requires cplusplus umbrella "CodeGen" module * { export * } } module Clang_Config { requires cplusplus umbrella "Config" module * { export * } } +// Files for diagnostic groups are spread all over the include/clang/ tree, but +// logically form a single module. +module Clang_Diagnostics { + requires cplusplus + + module All { header "Basic/AllDiagnostics.h" export * } + module Analysis { header "Analysis/AnalysisDiagnostic.h" export * } + module AST { header "AST/ASTDiagnostic.h" export * } + module Comment { header "AST/CommentDiagnostic.h" export * } + module Driver { header "Driver/DriverDiagnostic.h" export * } + module Frontend { header "Frontend/FrontendDiagnostic.h" export * } + module Lex { header "Lex/LexDiagnostic.h" export * } + module Parse { header "Parse/ParseDiagnostic.h" export * } + // FIXME: This breaks the build of Clang_Sema, for unknown reasons. + //module Sema { header "Sema/SemaDiagnostic.h" export * } + module Serialization { header "Serialization/SerializationDiagnostic.h" export * } +} + module Clang_Driver { requires cplusplus umbrella "Driver" @@ -101,9 +117,6 @@ module Clang_StaticAnalyzer { // This file is intended for repeated textual inclusion. exclude header "StaticAnalyzer/Core/Analyses.def" - // FIXME: This is logically a part of Basic, but has been put in the wrong place. - exclude header "StaticAnalyzer/Core/AnalyzerOptions.h" - module * { export * } } |