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] Replaced Tool::constructJob()’s LinkingOutput parameter with an OutputMode parameter.

Browse Source 
Moved OutputMode out of Driver and directly into swift::driver.
Adjusted callers of Tool::constructJob() to pass an OutputMode.

Swift SVN r12497
This commit is contained in:
Connor Wakamo
2014-01-17 19:39:23 +00:00
parent 11a6121caa
commit db3888ba0f
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Driver/Tools.cpp
View File

@@ -32,7 +32,7 @@ using namespace llvm::opt;
Job *Swift::constructJob(const JobAction &JA, std::unique_ptr<JobList> Inputs,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions, const ArgList &Args,
StringRef LinkingOutput) const {
const OutputMode &OM) const {
ArgStringList Arguments;
const char *Exec = getToolChain().getDriver().getSwiftProgramPath();
@@ -158,7 +158,7 @@ Job *MergeModule::constructJob(const JobAction &JA,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions,
const ArgList &Args,
StringRef LinkingOutput) const {
const OutputMode &OM) const {
ArgStringList Arguments;
const char *Exec = getToolChain().getDriver().getSwiftProgramPath();
@@ -204,7 +204,7 @@ Job *darwin::Linker::constructJob(const JobAction &JA,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions,
const ArgList &Args,
StringRef LinkingOutput) const {
const OutputMode &OM) const {
assert(Output->getPrimaryOutputType() == types::TY_Image &&
"Invalid linker output type.");
ArgStringList Arguments;