averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Bob Wilson
2016-10-17 11:52:21 -07:00
parent fd5e69f18a 781ee82cf6
commit 1caba3e209
222 changed files with 4965 additions and 4290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/swift-ide-test/swift-ide-test.cpp
View File

@@ -245,6 +245,9 @@ ImportPaths("I", llvm::cl::desc("add a directory to the import search path"));
static llvm::cl::list<std::string>
FrameworkPaths("F", llvm::cl::desc("add a directory to the framework search path"));
static llvm::cl::list<std::string>
SystemFrameworkPaths("iframework", llvm::cl::desc("add a directory to the system framework search path"));
static llvm::cl::opt<std::string>
ResourceDir("resource-dir",
llvm::cl::desc("The directory that holds the compiler resource files"));
@@ -2717,7 +2720,7 @@ int main(int argc, char *argv[]) {
if (options::Action == ActionType::DumpCompletionCache) {
if (options::InputFilenames.empty()) {
llvm::errs() << "-dump-completin-cache requires an input file\n";
llvm::errs() << "-dump-completion-cache requires an input file\n";
return 1;
}
@@ -2781,6 +2784,11 @@ int main(int argc, char *argv[]) {
options::ModuleCachePath;
InitInvok.setImportSearchPaths(options::ImportPaths);
InitInvok.setFrameworkSearchPaths(options::FrameworkPaths);
for (const auto &systemFrameworkPath : options::SystemFrameworkPaths) {
auto &extraArgs = InitInvok.getClangImporterOptions().ExtraArgs;
extraArgs.push_back("-iframework");
extraArgs.push_back(systemFrameworkPath);
}
InitInvok.getFrontendOptions().EnableSourceImport |=
options::EnableSourceImport;
InitInvok.getFrontendOptions().ImplicitObjCHeaderPath =