[clang] e0e7eb2 - [clang] Add missing .def files to Clang's modulemap

[Raphael Isemann via cfe-commits]

Author: Raphael Isemann
Date: 2020-09-02T20:42:12+02:00
New Revision: e0e7eb2e2648aee83caf2ecfe2972ce2f653d306

URL: https://github.com/llvm/llvm-project/commit/e0e7eb2e2648aee83caf2ecfe2972ce2f653d306
DIFF: https://github.com/llvm/llvm-project/commit/e0e7eb2e2648aee83caf2ecfe2972ce2f653d306.diff

LOG: [clang] Add missing .def files to Clang's modulemap

These new .def files weren't marked as textual so they ended up being compiled
into the Clang module (which completely defeats the purpose of .def files).

Added: 
    

Modified: 
    clang/include/clang/module.modulemap

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/module.modulemap b/clang/include/clang/module.modulemap
index 13d4dbf9dc2e..6290548b41f1 100644
--- a/clang/include/clang/module.modulemap
+++ b/clang/include/clang/module.modulemap
@@ -52,8 +52,10 @@ module Clang_Basic {
   textual header "Basic/BuiltinsX86_64.def"
   textual header "Basic/BuiltinsXCore.def"
   textual header "Basic/CodeGenOptions.def"
+  textual header "Basic/CommentOptions.def"
   textual header "Basic/DiagnosticOptions.def"
   textual header "Basic/Features.def"
+  textual header "Basic/FileSystemOptions.def"
   textual header "Basic/FPOptions.def"
   textual header "Basic/MSP430Target.def"
   textual header "Basic/LangOptions.def"
@@ -63,6 +65,7 @@ module Clang_Basic {
   textual header "Basic/OpenMPKinds.def"
   textual header "Basic/OperatorKinds.def"
   textual header "Basic/Sanitizers.def"
+  textual header "Basic/TargetOptions.def"
   textual header "Basic/TokenKinds.def"
   textual header "Basic/X86Target.def"
 
@@ -107,17 +110,35 @@ module Clang_Frontend {
   umbrella "Frontend"
 
   textual header "Basic/LangStandards.def"
+  textual header "Frontend/DependencyOutputOptions.def"
+  textual header "Frontend/FrontendOptions.def"
+  textual header "Frontend/MigratorOptions.def"
+  textual header "Frontend/PreprocessorOutputOptions.def"
 
   module * { export * }
 }
 
 module Clang_FrontendTool { requires cplusplus umbrella "FrontendTool" module * { export * } }
 module Clang_Index { requires cplusplus umbrella "Index" module * { export * } }
-module Clang_Lex { requires cplusplus umbrella "Lex" module * { export * } }
+module Clang_Lex {
+  requires cplusplus
+  umbrella "Lex"
+  textual header "Lex/HeaderSearchOptions.def"
+  textual header "Lex/PreprocessorOptions.def"
+
+  module * { export * }
+}
 module Clang_Parse { requires cplusplus umbrella "Parse" module * { export * } }
 module Clang_Rewrite { requires cplusplus umbrella "Rewrite/Core" module * { export * } }
 module Clang_RewriteFrontend { requires cplusplus umbrella "Rewrite/Frontend" module * { export * } }
-module Clang_Sema { requires cplusplus umbrella "Sema" module * { export * } }
+module Clang_Sema {
+  requires cplusplus
+  umbrella "Sema"
+
+  textual header "Sema/CodeCompleteOptions.def"
+
+  module * { export * }
+}
 
 module Clang_Serialization {
   requires cplusplus