maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

If an excluded header does not exist, just ignore it 

llvm-svn: 168077
This commit is contained in:
Douglas Gregor 2012-11-15 19:47:16 +00:00
parent f34e4fa7a6
commit 4b27a64b92
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Lex/ModuleMap.cpp
View File

@ -1307,7 +1307,9 @@ void ModuleMapParser::parseHeaderDecl(SourceLocation UmbrellaLoc,
if (BuiltinFile) if (BuiltinFile)
Map.addHeader(ActiveModule, BuiltinFile, Exclude); Map.addHeader(ActiveModule, BuiltinFile, Exclude);
} }
} else { } else if (!Exclude) {
// Ignore excluded header files. They're optional anyway.
Diags.Report(FileNameLoc, diag::err_mmap_header_not_found) Diags.Report(FileNameLoc, diag::err_mmap_header_not_found)
<< Umbrella << FileName; << Umbrella << FileName;
HadError = true; HadError = true;

1
clang/test/Modules/Inputs/module.map
View File

@ -63,6 +63,7 @@ module decldef {
module redecl_merge_top { module redecl_merge_top {
header "redecl-merge-top.h" header "redecl-merge-top.h"
explicit module Explicit { header "redecl-merge-top-explicit.h" } explicit module Explicit { header "redecl-merge-top-explicit.h" }
exclude header "nonexistent.h"
} }
module redecl_merge_left { module redecl_merge_left {
header "redecl-merge-left.h" header "redecl-merge-left.h"