From 0d13088ab99cf7d981932451d65034595949ebf8 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 2 Oct 2024 21:20:40 +0200
Subject: Ensure the initial task order is preserved. Fixes bad ordering during
 linking.

---
 src/task_cc.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/task_cc.cc')

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);
+			}
 		}
 	}
 
-- 
cgit v1.2.3