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:
swift-ci
2018-07-19 16:49:18 -07:00
parent eac91c96cd 08ec1ba7a0
commit 817e5e80e7
22 changed files with 294 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/FrontendTool/FrontendTool.cpp
View File

@@ -771,9 +771,13 @@ static bool writeTBDIfNeeded(CompilerInvocation &Invocation,
if (!frontendOpts.InputsAndOutputs.hasTBDPath())
return false;
if (!frontendOpts.InputsAndOutputs.isWholeModule()) {
Instance.getDiags().diagnose(SourceLoc(),
diag::tbd_only_supported_in_whole_module);
return false;
}
const std::string &TBDPath = Invocation.getTBDPathForWholeModule();
assert(!TBDPath.empty() &&
"If not WMO, getTBDPathForWholeModule should have failed");
auto installName = frontendOpts.TBDInstallName.empty()
? "lib" + Invocation.getModuleName().str() + ".dylib"
@@ -1807,7 +1811,7 @@ int swift::performFrontend(ArrayRef<const char *> Args,
if (Invocation.getFrontendOptions()
.InputsAndOutputs.hasDependencyTrackerPath() ||
!Invocation.getFrontendOptions().IndexStorePath.empty())
Instance->createDependencyTracker();
Instance->createDependencyTracker(Invocation.getFrontendOptions().TrackSystemDeps);
if (Instance->setup(Invocation)) {
return finishDiagProcessing(1);