From b25810b9668abe8f7cc7db24326a98c1b017966e Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 21 Jun 2021 21:39:46 +0200 Subject: Distinguish between host and target builds. --- task_ld.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'task_ld.cc') diff --git a/task_ld.cc b/task_ld.cc index 7bf68ed..cd1dea3 100644 --- a/task_ld.cc +++ b/task_ld.cc @@ -66,13 +66,13 @@ TaskLD::TaskLD(const BuildConfiguration& config, flagsFile += ".flags"; target_type = TargetType::Executable; - _language = Language::C; + source_language = Language::C; for(const auto& source : config.sources) { std::filesystem::path sourceFile(source); if(sourceFile.extension().string() != ".c") { - _language = Language::Cpp; + source_language = Language::Cpp; } } } @@ -159,12 +159,7 @@ int TaskLD::runInner() std::cout << "LD => " << targetFile.string() << "\n"; } - auto tool = getConfiguration("host-cpp", "/usr/bin/g++"); - if(language() == Language::C) - { - tool = getConfiguration("host-cc", "/usr/bin/gcc"); - } - + auto tool = compiler(); return execute(tool, args, settings.verbose > 0); } -- cgit v1.2.3