From 80db51ae3f7d5fbfb52eee4505f615ea4edba62d Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 29 May 2022 16:08:31 +0200 Subject: Use derived dependency task targets instead of 'raw' depends strings for linkage. --- src/task_so.cc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/task_so.cc') diff --git a/src/task_so.cc b/src/task_so.cc index 430c3e1..44340dd 100644 --- a/src/task_so.cc +++ b/src/task_so.cc @@ -81,16 +81,6 @@ bool TaskSO::dirtyInner() int TaskSO::runInner() { - std::string objectlist; - for(const auto& objectFile : objectFiles) - { - if(!objectlist.empty()) - { - objectlist += " "; - } - objectlist += objectFile.string(); - } - std::vector args; args.push_back("-fPIC"); @@ -99,9 +89,9 @@ int TaskSO::runInner() args.push_back("-o"); args.push_back(targetFile.string()); - for(const auto& objectFile : objectFiles) + for(const auto& task : getDependsTasks()) { - args.push_back(objectFile.string()); + args.push_back(task->target()); } for(const auto& depFile : depFiles) -- cgit v1.2.3