diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-09-12 20:41:59 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-09-12 20:41:59 +0000 |
| commit | 1e44e0229288aa4826bdd2e62546b9156032f718 (patch) | |
| tree | a396ecf7fd708f29746c6339a5c01fb0c0c0cf8e /clang/lib/Frontend/CompilerInstance.cpp | |
| parent | 4a9eb5f8dc613a9afe925ce3c277a7078e1bb8a1 (diff) | |
| download | bcm5719-llvm-1e44e0229288aa4826bdd2e62546b9156032f718.tar.gz bcm5719-llvm-1e44e0229288aa4826bdd2e62546b9156032f718.zip | |
Introduce a cc1-level option to provide the path to the module cache,
where the compiler will look for module files. Eliminates the
egregious hack where we looked into the header search paths for
modules.
llvm-svn: 139538
Diffstat (limited to 'clang/lib/Frontend/CompilerInstance.cpp')
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index bd019e0cf23..1106e48e910 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -636,14 +636,8 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc, CurFile = SourceMgr.getFileEntryForID(SourceMgr.getMainFileID()); // Search for a module with the given name. - std::string Filename = ModuleName.getName().str(); - Filename += ".pcm"; - const DirectoryLookup *CurDir = 0; const FileEntry *ModuleFile - = PP->getHeaderSearchInfo().LookupFile(Filename, /*isAngled=*/false, - /*FromDir=*/0, CurDir, CurFile, - /*SearchPath=*/0, - /*RelativePath=*/0); + = PP->getHeaderSearchInfo().lookupModule(ModuleName.getName()); if (!ModuleFile) { getDiagnostics().Report(ModuleNameLoc, diag::err_module_not_found) << ModuleName.getName() |
