summaryrefslogtreecommitdiff
path: root/src/task_cc.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2024-10-02 21:20:40 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2024-10-02 22:02:51 +0200
commit0d13088ab99cf7d981932451d65034595949ebf8 (patch)
treec3e89b948afe2ac3191833d94c971a4456ccc1a1 /src/task_cc.cc
parenta38c6682e4fb1f45aa1f37d10c2480aa517ea3bc (diff)
Ensure the initial task order is preserved. Fixes bad ordering during linking.
Diffstat (limited to 'src/task_cc.cc')
-rw-r--r--src/task_cc.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/task_cc.cc b/src/task_cc.cc
index 294c5ea..4eb07ae 100644
--- a/src/task_cc.cc
+++ b/src/task_cc.cc
@@ -6,6 +6,7 @@
#include <iostream>
#include <fstream>
#include <cassert>
+#include <algorithm>
#include "ctor.h"
#include "execute.h"
@@ -72,13 +73,16 @@ TaskCC::TaskCC(const ctor::build_configuration& config, const ctor::settings& se
std::filesystem::create_directories(targetFile().parent_path());
}
-int TaskCC::registerDepTasksInner(const std::set<std::shared_ptr<Task>>& tasks)
+int TaskCC::registerDepTasksInner(const std::vector<std::shared_ptr<Task>>& tasks)
{
for(const auto& task : tasks)
{
if(*task == _source.file)
{
- dependsTasks.insert(task);
+ if(std::find(dependsTasks.begin(), dependsTasks.end(), task) == dependsTasks.end())
+ {
+ dependsTasks.push_back(task);
+ }
}
}