Author: Michael Spencer Date: 2020-03-02T10:02:39+01:00 New Revision: 5405c262a4abec1a9cf0b8b89aabbf529209262a
URL: https://github.com/llvm/llvm-project/commit/5405c262a4abec1a9cf0b8b89aabbf529209262a DIFF: https://github.com/llvm/llvm-project/commit/5405c262a4abec1a9cf0b8b89aabbf529209262a.diff LOG: [llvm][Support][modulemap] Exclude WindowsSupport.h from the LLVM_Util module rG01f9abbb50b1 moved WindowsSupport.h to include/llvm/Support/Windows/ This is a problem because the modulemap include all of the Support and ADT directories, thus any use of any header in Support or ADT would cause the compiler to try to build WindowsSupport.h, which only works on Windows. Fix this by explicitly excluding WindowsSupport.h from the LLVM_Util module. (cherry picked from commit 0b6abe428164c38c7dec6c539e454cfd671067a4) Added: Modified: llvm/include/llvm/module.modulemap Removed: ################################################################################ diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap index 05de40698e35..d281682ae003 100644 --- a/llvm/include/llvm/module.modulemap +++ b/llvm/include/llvm/module.modulemap @@ -380,6 +380,9 @@ module LLVM_Utils { umbrella "Support" module * { export * } + + // Exclude this; it should only be used on Windows. + exclude header "Support/Windows/WindowsSupport.h" // Exclude these; they are fundamentally non-modular. exclude header "Support/PluginLoader.h" _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits