From c53e622b648635539e4870fd0c9159c5d8c3be4a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 20 Jun 2021 20:21:58 +0200 Subject: Introduction of configuration generation for controlling tool-chain. --- task_ar.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'task_ar.cc') diff --git a/task_ar.cc b/task_ar.cc index 58223ad..dca122b 100644 --- a/task_ar.cc +++ b/task_ar.cc @@ -41,7 +41,7 @@ TaskAR::TaskAR(const BuildConfiguration& config, const Settings& settings, const std::string& target, const std::vector& objects) - : Task(addPrefix(config.depends, settings)) + : Task(config, addPrefix(config.depends, settings)) , config(config) , settings(settings) { @@ -63,6 +63,17 @@ TaskAR::TaskAR(const BuildConfiguration& config, flagsFile = settings.builddir / targetFile.stem(); flagsFile += ".flags"; + + target_type = TargetType::StaticLibrary; + _language = Language::C; + for(const auto& source : config.sources) + { + std::filesystem::path sourceFile(source); + if(sourceFile.extension().string() != ".c") + { + _language = Language::Cpp; + } + } } bool TaskAR::dirtyInner() @@ -132,7 +143,8 @@ int TaskAR::runInner() std::cout << "AR => " << targetFile.string() << "\n"; } - return execute("/usr/bin/ar", args, settings.verbose > 0); + auto tool = getConfiguration("host-ar", "/usr/bin/ar"); + return execute(tool, args, settings.verbose > 0); } int TaskAR::clean() -- cgit v1.2.3