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

Driver: renamic LinkJob to DynamicLinkJob and ArchiveJob to StaticLinkJob

Browse Source 
# Conflicts:
#	lib/Driver/DarwinToolChains.cpp
This commit is contained in:
Thomas Roughton
2019-06-12 12:24:40 +12:00
parent b34a1cbbc6
commit e5ea42d774
10 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Driver/DarwinToolChains.cpp
View File

@@ -223,9 +223,8 @@ static bool wantsObjCRuntime(const llvm::Triple &triple) {
}
ToolChain::InvocationInfo
toolchains::Darwin::constructInvocation(const LinkJobAction &job,
const JobContext &context) const
{
toolchains::Darwin::constructInvocation(const DynamicLinkJobAction &job,
const JobContext &context) const {
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
"Invalid linker output type.");
@@ -531,7 +530,7 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
ToolChain::InvocationInfo
toolchains::Darwin::constructInvocation(const ArchiveJobAction &job,
toolchains::Darwin::constructInvocation(const StaticLinkJobAction &job,
const JobContext &context) const {
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
"Invalid linker output type.");