1 files changed, 52 insertions, 26 deletions

diff --git a/src/task_ar.cc b/src/task_ar.cc
index 3e1746c..3b45cc2 100644
--- a/src/task_ar.cc
+++ b/src/task_ar.cc
@@ -6,23 +6,27 @@
 #include <iostream>
 #include <fstream>
 
-#include "libctor.h"
+#include "ctor.h"
 #include "execute.h"
 #include "util.h"
+#include "tools.h"
 
-TaskAR::TaskAR(const BuildConfiguration& config,
-               const Settings& settings,
+TaskAR::TaskAR(const ctor::build_configuration& config_,
+               const ctor::settings& settings_,
                const std::string& target,
                const std::vector<std::string>& objects,
-               const std::string& sourceDir)
-	: Task(config, settings, sourceDir)
-	, config(config)
-	, settings(settings)
-	, sourceDir(sourceDir)
+               const std::string& sourceDir_)
+	: Task(config_, settings_, sourceDir_)
+	, _targetFile(target)
+	, config(config_)
+	, settings(settings_)
+	, sourceDir(sourceDir_)
 {
-	std::filesystem::create_directories(std::filesystem::path(settings.builddir) / sourceDir);
+	target_type = ctor::target_type::static_library;
+	output_system = config.system;
 
-	_targetFile = target;
+	auto toolchain = getToolChain(config.system);
+	_targetFile = extension(toolchain, target_type, config.system, _targetFile);
 	for(const auto& object : objects)
 	{
 		std::filesystem::path objectFile = object;
@@ -32,23 +36,24 @@ TaskAR::TaskAR(const BuildConfiguration& config,
 
 	for(const auto& dep : config.depends)
 	{
-		depFiles.push_back(dep);
+		depFiles.emplace_back(dep);
 	}
 
 	flagsFile = std::filesystem::path(settings.builddir) / cleanUp(sourceDir) / targetFile().stem();
 	flagsFile += ".flags";
 
-	target_type = TargetType::StaticLibrary;
-	source_language = Language::C;
+	source_language = ctor::language::c;
 	for(const auto& source : config.sources)
 	{
 		std::filesystem::path sourceFile(source.file);
 		// TODO: Use task languages instead
 		if(sourceFile.extension().string() != ".c")
 		{
-			source_language = Language::Cpp;
+			source_language = ctor::language::cpp;
 		}
 	}
+
+	std::filesystem::create_directories(targetFile().parent_path());
 }
 
 bool TaskAR::dirtyInner()
@@ -77,9 +82,17 @@ bool TaskAR::dirtyInner()
 
 int TaskAR::runInner()
 {
+	auto toolchain = getToolChain(config.system);
+
 	std::vector<std::string> args;
-	args.push_back("rcs");
-	args.push_back(targetFile().string());
+	for(const auto& flag : config.flags.arflags)
+	{
+		append(args, to_strings(toolchain, flag));
+	}
+	append(args, ar_option(toolchain, ctor::ar_opt::replace));
+	append(args, ar_option(toolchain, ctor::ar_opt::add_index));
+	append(args, ar_option(toolchain, ctor::ar_opt::create));
+	append(args, ar_option(toolchain, ctor::ar_opt::output, targetFile().string()));
 	for(const auto& task : getDependsTasks())
 	{
 		args.push_back(task->targetFile().string());
@@ -92,21 +105,29 @@ int TaskAR::runInner()
 
 	if(settings.verbose == 0)
 	{
-		std::cout << "AR => " << targetFile().string() << "\n";
+		std::string output = "AR => " + targetFile().string() + '\n';
+		std::cout << output << std::flush;
 	}
 
+	const auto& c = ctor::get_configuration();
 	std::string tool;
 	switch(outputSystem())
 	{
-	case OutputSystem::Host:
-		tool = getConfiguration(cfg::host_ar, "/usr/bin/ar");
+	case ctor::output_system::host:
+		tool = c.get(ctor::cfg::host_ar, "/usr/bin/ar");
 		break;
-	case OutputSystem::Build:
-		tool = getConfiguration(cfg::build_ar, "/usr/bin/ar");
+	case ctor::output_system::build:
+		tool = c.get(ctor::cfg::build_ar, "/usr/bin/ar");
 		break;
 	}
 
-	return execute(tool, args, settings.verbose > 0);
+	auto res = execute(settings, tool, args, c.env);
+	if(res != 0)
+	{
+		std::filesystem::remove(targetFile());
+	}
+
+	return res;
 }
 
 int TaskAR::clean()
@@ -159,16 +180,21 @@ bool TaskAR::derived() const
 
 std::string TaskAR::flagsString() const
 {
+	auto toolchain = getToolChain(config.system);
 	std::string flagsStr;
+	bool first{true};
 	for(const auto& flag : config.flags.ldflags)
 	{
-		if(flag != config.flags.ldflags[0])
+		for(const auto& str : to_strings(toolchain, flag))
 		{
-			flagsStr += " ";
+			if(first)
+			{
+				flagsStr += " ";
+				first = false;
+			}
+			flagsStr += str;
 		}
-		flagsStr += flag;
 	}
-	flagsStr += "\n";
 
 	for(const auto& dep : config.depends)
 	{