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

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

Browse Source
This commit is contained in:
swift_jenkins
2020-08-20 20:54:07 -07:00
parent 999178399f 5a1f38bf41
commit 21c2e0ebac
10 changed files with 225 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Frontend/CompilerInvocation.cpp
View File

@@ -926,7 +926,8 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
}
if (const Arg *A = Args.getLastArg(OPT_placeholder_dependency_module_map))
Opts.PlaceholderDependencyModuleMap = A->getValue();
if (const Arg *A = Args.getLastArg(OPT_batch_scan_input_file))
Opts.BatchScanInputFilePath = A->getValue();
// Opts.RuntimeIncludePath is set by calls to
// setRuntimeIncludePath() or setMainExecutablePath().
// Opts.RuntimeImportPath is set by calls to