[clang] 3b12e12 - Revert "[clang] Add missing .def files to Clang's modulemap"

[Adrian Prantl via cfe-commits]

Author: Adrian Prantl
Date: 2020-09-02T14:15:32-07:00
New Revision: 3b12e12d4b9efbdd28113da6db0f74b660257c83

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

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

This reverts commit e0e7eb2e2648aee83caf2ecfe2972ce2f653d306.

[the commit this fixes up was reverted]

Added: 
    

Modified: 
    clang/include/clang/module.modulemap

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/module.modulemap b/clang/include/clang/module.modulemap
index 6290548b41f1..13d4dbf9dc2e 100644
--- a/clang/include/clang/module.modulemap
+++ b/clang/include/clang/module.modulemap
@@ -52,10 +52,8 @@ 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"
@@ -65,7 +63,6 @@ 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"
 
@@ -110,35 +107,17 @@ 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"
-  textual header "Lex/HeaderSearchOptions.def"
-  textual header "Lex/PreprocessorOptions.def"
-
-  module * { export * }
-}
+module Clang_Lex { requires cplusplus umbrella "Lex" 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"
-
-  textual header "Sema/CodeCompleteOptions.def"
-
-  module * { export * }
-}
+module Clang_Sema { requires cplusplus umbrella "Sema" module * { export * } }
 
 module Clang_Serialization {
   requires cplusplus