[clang] 5708f2d - [clang] Fix modules build after addition of TypeBitCodes.def
Author: Raphael Isemann Date: 2019-12-14T18:24:53+01:00 New Revision: 5708f2daf7386ef5f1ec54db4bda2b48bbcbe934 URL: https://github.com/llvm/llvm-project/commit/5708f2daf7386ef5f1ec54db4bda2b48bbcbe934 DIFF: https://github.com/llvm/llvm-project/commit/5708f2daf7386ef5f1ec54db4bda2b48bbcbe934.diff LOG: [clang] Fix modules build after addition of TypeBitCodes.def In revision 139006ceb641f038a2b19cac1174316e57004ed6 the Serialization folder got its first def file 'TypeBitCodes.def'. This broke the modules build as this .def file was not textually included but implicitly converted into a module due to our umbrella directive. This patch fixes this by explicitly marking the .def file as textual. Added: Modified: clang/include/clang/module.modulemap Removed: diff --git a/clang/include/clang/module.modulemap b/clang/include/clang/module.modulemap index 2cbe865bce87..b3e2108d3fa6 100644 --- a/clang/include/clang/module.modulemap +++ b/clang/include/clang/module.modulemap @@ -114,7 +114,15 @@ 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_Serialization { requires cplusplus umbrella "Serialization" module * { export * } } + +module Clang_Serialization { + requires cplusplus + umbrella "Serialization" + + textual header "Serialization/TypeBitCodes.def" + + module * { export * } +} module Clang_StaticAnalyzer_Core { requires cplusplus ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
Re: [clang] 5708f2d - [clang] Fix modules build after addition of TypeBitCodes.def
On 14 Dec 2019, at 12:25, Raphael Isemann via cfe-commits wrote: Author: Raphael Isemann Date: 2019-12-14T18:24:53+01:00 New Revision: 5708f2daf7386ef5f1ec54db4bda2b48bbcbe934 URL: https://github.com/llvm/llvm-project/commit/5708f2daf7386ef5f1ec54db4bda2b48bbcbe934 DIFF: https://github.com/llvm/llvm-project/commit/5708f2daf7386ef5f1ec54db4bda2b48bbcbe934.diff LOG: [clang] Fix modules build after addition of TypeBitCodes.def In revision 139006ceb641f038a2b19cac1174316e57004ed6 the Serialization folder got its first def file 'TypeBitCodes.def'. This broke the modules build as this .def file was not textually included but implicitly converted into a module due to our umbrella directive. This patch fixes this by explicitly marking the .def file as textual. Sorry, thanks! John. ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits