Fix modules build with shared library.

r341994 caused clangAnalysis to pull all of the AST matchers
library into clang. Due to inline key functions in the headers,
importing the AST matchers library gives a link dependency on the
AST matchers (and thus the AST), which clang should not
have.

This patch works around the issues by excluding the offending
libclangAnalysis header in the modulemap.

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

diff --git a/include/clang/module.modulemap b/include/clang/module.modulemap
index 8d525c5ffbacd281916ae6d019baf256e0b986c1..4cf5cd44bf36d26463dd033f3301c04f3823c23d 100644 (file)
--- a/include/clang/module.modulemap
+++ b/include/clang/module.modulemap
@@ -5,6 +5,12 @@ module Clang_Analysis {
   textual header "Analysis/Analyses/ThreadSafetyOps.def"
 
   module * { export * }
+
+  // FIXME: Exclude these headers to avoid pulling all of the AST matchers
+  // library into clang. Due to inline key functions in the headers,
+  // importing the AST matchers library gives a link dependency on the AST
+  // matchers (and thus the AST), which clang-format should not have.
+  exclude header "Analysis/Analyses/ExprMutationAnalyzer.h"
 }
 
 module Clang_AST {