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

8
lib/Driver/Driver.cpp
View File

@@ -1964,10 +1964,10 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
JobAction *LinkAction = nullptr;
if (OI.LinkAction == LinkKind::StaticLibrary) {
LinkAction = C.createAction<ArchiveJobAction>(AllLinkerInputs,
LinkAction = C.createAction<StaticLinkJobAction>(AllLinkerInputs,
OI.LinkAction);
} else {
LinkAction = C.createAction<LinkJobAction>(AllLinkerInputs,
LinkAction = C.createAction<DynamicLinkJobAction>(AllLinkerInputs,
OI.LinkAction);
}
@@ -2197,14 +2197,14 @@ static StringRef baseNameForImage(const JobAction *JA, const OutputInfo &OI,
if (JA->size() == 1 && OI.ModuleNameIsFallback && BaseInput != "-")
return llvm::sys::path::stem(BaseInput);
if (auto link = dyn_cast<ArchiveJobAction>(JA)) {
if (auto link = dyn_cast<StaticLinkJobAction>(JA)) {
Buffer = "lib";
Buffer.append(BaseName);
Buffer.append(Triple.isOSWindows() ? ".lib" : ".a");
return Buffer.str();
}
auto link = dyn_cast<LinkJobAction>(JA);
auto link = dyn_cast<DynamicLinkJobAction>(JA);
if (!link)
return BaseName;
if (link->getKind() != LinkKind::DynamicLibrary)