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

Manually merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Nathan Hawes
2020-08-04 13:47:48 -07:00
parent 48df21af61 154e56654c
commit 607e2b8822
150 changed files with 3925 additions and 1866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/FrontendTool/FrontendTool.cpp
View File

@@ -2463,17 +2463,18 @@ int swift::performFrontend(ArrayRef<const char *> Args,
}
CompilerInvocation Invocation;
std::string MainExecutablePath = llvm::sys::fs::getMainExecutable(Argv0,
MainAddr);
Invocation.setMainExecutablePath(MainExecutablePath);
SmallString<128> workingDirectory;
llvm::sys::fs::current_path(workingDirectory);
std::string MainExecutablePath =
llvm::sys::fs::getMainExecutable(Argv0, MainAddr);
// Parse arguments.
SmallVector<std::unique_ptr<llvm::MemoryBuffer>, 4> configurationFileBuffers;
if (Invocation.parseArgs(Args, Instance->getDiags(),
&configurationFileBuffers, workingDirectory)) {
&configurationFileBuffers, workingDirectory,
MainExecutablePath)) {
return finishDiagProcessing(1, /*verifierEnabled*/ false);
}