From 6af7742c35ecdf2831908443ca0e04bf23317a96 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 11 Jan 2023 19:57:00 +0100 Subject: Rename Configuation struct to configuration and make get/has functions member functions. --- src/task.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/task.cc') diff --git a/src/task.cc b/src/task.cc index cff850e..27e6c44 100644 --- a/src/task.cc +++ b/src/task.cc @@ -131,23 +131,24 @@ ctor::output_system Task::outputSystem() const std::string Task::compiler() const { + const auto& c = ctor::get_configuration(); switch(sourceLanguage()) { case ctor::language::c: switch(outputSystem()) { case ctor::output_system::host: - return getConfiguration(cfg::host_cc, "/usr/bin/gcc"); + return c.get(cfg::host_cc, "/usr/bin/gcc"); case ctor::output_system::build: - return getConfiguration(cfg::build_cc, "/usr/bin/gcc"); + return c.get(cfg::build_cc, "/usr/bin/gcc"); } case ctor::language::cpp: switch(outputSystem()) { case ctor::output_system::host: - return getConfiguration(cfg::host_cxx, "/usr/bin/g++"); + return c.get(cfg::host_cxx, "/usr/bin/g++"); case ctor::output_system::build: - return getConfiguration(cfg::build_cxx, "/usr/bin/g++"); + return c.get(cfg::build_cxx, "/usr/bin/g++"); } default: std::cerr << "Unknown CC target type\n"; -- cgit v1.2.3