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/modulemap-locations.m | |
| 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/modulemap-locations.m')
| -rw-r--r-- | clang/test/Modules/modulemap-locations.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Modules/modulemap-locations.m b/clang/test/Modules/modulemap-locations.m index 9acdcd63436..949c4786263 100644 --- a/clang/test/Modules/modulemap-locations.m +++ b/clang/test/Modules/modulemap-locations.m @@ -1,5 +1,5 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I %S/Inputs/ModuleMapLocations/Module_ModuleMap -I %S/Inputs/ModuleMapLocations/Both -F %S/Inputs/ModuleMapLocations -x objective-c -fsyntax-only %s -verify +// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I %S/Inputs/ModuleMapLocations/Module_ModuleMap -I %S/Inputs/ModuleMapLocations/Both -F %S/Inputs/ModuleMapLocations -I %S/Inputs/ModuleMapLocations -F %S/Inputs -x objective-c -fsyntax-only %s -verify // regular @import module_modulemap; |
