Don't look in the standard import locations when building the core standard library.

This is a better way to fix the Darwin overlay <-> swift_stdlib_core
inferred circular dependency <rdar://problem/16603168>.

Swift SVN r16476
This commit is contained in:
Doug Gregor
2014-04-17 22:07:48 +00:00
parent 96bc99e3c4
commit 5698fd3b8a
6 changed files with 17 additions and 1 deletions

View File

@@ -114,6 +114,10 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
}
}
// If we're not allowed to look in the runtime library import path, stop.
if (ctx.SearchPathOpts.SkipRuntimeLibraryImportPath)
return llvm::make_error_code(llvm::errc::no_such_file_or_directory);
// Search the runtime import path.
isFramework = false;
return openModuleFiles(ctx.SearchPathOpts.RuntimeLibraryImportPath,