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
2017-05-20 14:28:35 -07:00
parent 01f987874c 4a46d47a05
commit 61360ed262
5 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1033,6 +1033,11 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
}
}
Opts.EnableNSKeyedArchiverDiagnostics =
Args.hasFlag(OPT_enable_nskeyedarchiver_diagnostics,
OPT_disable_nskeyedarchiver_diagnostics,
Opts.EnableNSKeyedArchiverDiagnostics);
llvm::Triple Target = Opts.Target;
StringRef TargetArg;
if (const Arg *A = Args.getLastArg(OPT_target)) {