[modules] Try harder to stop DebugInfo/PDB/DIA being built if not available.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229243 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index 8f80c02..5a2a54c 100644 (file)
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -53,10 +53,23 @@ module LLVM_DebugInfo_PDB {
 
   umbrella "DebugInfo/PDB"
   module * { export * }
+
+  // Separate out this subdirectory; it's an optional component that depends on
+  // a separate library which might not be available.
+  //
+  // FIXME: There should be a better way to specify this.
+  exclude header "DebugInfo/PDB/DIADataStream.h"
+  exclude header "DebugInfo/PDB/DIAEnumDebugStreams.h"
+  exclude header "DebugInfo/PDB/DIAEnumLineNumbers.h"
+  exclude header "DebugInfo/PDB/DIAEnumSourceFiles.h"
+  exclude header "DebugInfo/PDB/DIAEnumSymbols.h"
+  exclude header "DebugInfo/PDB/DIALineNumber.h"
+  exclude header "DebugInfo/PDB/DIARawSymbol.h"
+  exclude header "DebugInfo/PDB/DIASession.h"
+  exclude header "DebugInfo/PDB/DIASourceFile.h"
+  exclude header "DebugInfo/PDB/DIASupport.h"
 }
 
-// Separate out this subdirectory; it's an optional component that depends on
-// a separate library which might not be available.
 module LLVM_DebugInfo_PDB_DIA {
   requires cplusplus