diff options
| author | Ben Langmuir <blangmuir@apple.com> | 2015-02-24 04:58:15 +0000 |
|---|---|---|
| committer | Ben Langmuir <blangmuir@apple.com> | 2015-02-24 04:58:15 +0000 |
| commit | 1f6a32b3e7aa095263a5a0bbb1cc0576dce441a6 (patch) | |
| tree | 147eaf2b4883a589053c55467ca88f26a00c065a /clang/test/Modules/Inputs/ModuleMapLocations | |
| parent | d0a19981c4f6d275707571fc1530ac8846853940 (diff) | |
| download | bcm5719-llvm-1f6a32b3e7aa095263a5a0bbb1cc0576dce441a6.tar.gz bcm5719-llvm-1f6a32b3e7aa095263a5a0bbb1cc0576dce441a6.zip | |
Don't load Framework module.map files when searching subdirectories
This would cause frameworks to have spurious "redefinition" errors if
they had both a (legacy) "module.map" and a (new) "module.modulemap" file and we
happened to do a sub-directory search in that directory using a
non-framework include path (e.g. -Ifoo/ -Ffoo/). For migration
purposes it's very handy that the compiler will prefer the new spelling
of the filename and not look at the old one if it doesn't need to.
llvm-svn: 230308
Diffstat (limited to 'clang/test/Modules/Inputs/ModuleMapLocations')
| -rw-r--r-- | clang/test/Modules/Inputs/ModuleMapLocations/Both_F.framework/Headers/a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Both_F.framework/Headers/a.h b/clang/test/Modules/Inputs/ModuleMapLocations/Both_F.framework/Headers/a.h index 9dabfc089a1..aa47ef47c48 100644 --- a/clang/test/Modules/Inputs/ModuleMapLocations/Both_F.framework/Headers/a.h +++ b/clang/test/Modules/Inputs/ModuleMapLocations/Both_F.framework/Headers/a.h @@ -1 +1,2 @@ +@import Module; // Don't cause redefinition error. void will_be_found2(void); |
