summaryrefslogtreecommitdiff
path: root/src/rebuild.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2023-01-11 19:57:00 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2023-01-11 20:06:56 +0100
commit6af7742c35ecdf2831908443ca0e04bf23317a96 (patch)
tree9ada42d1d4b6bcb2618c1325f155429d2035808a /src/rebuild.cc
parent648c89e879f739f82ed6dba7df7243e54b98601f (diff)
Rename Configuation struct to configuration and make get/has functions member functions.
Diffstat (limited to 'src/rebuild.cc')
-rw-r--r--src/rebuild.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rebuild.cc b/src/rebuild.cc
index 7e5259a..3033a46 100644
--- a/src/rebuild.cc
+++ b/src/rebuild.cc
@@ -170,17 +170,18 @@ bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[
getOption(tool_chain, opt::optimization, "3"));
append(config.flags.cxxflags,
getOption(tool_chain, opt::cpp_std, "c++20"));
- if(hasConfiguration(cfg::ctor_includedir))
+ const auto& c = ctor::get_configuration();
+ if(c.has(cfg::ctor_includedir))
{
append(config.flags.cxxflags,
getOption(tool_chain, opt::include_path,
- getConfiguration(cfg::ctor_includedir)));
+ c.get(cfg::ctor_includedir)));
}
- if(hasConfiguration(cfg::ctor_libdir))
+ if(c.has(cfg::ctor_libdir))
{
append(config.flags.ldflags,
getOption(tool_chain, opt::library_path,
- getConfiguration(cfg::ctor_libdir)));
+ c.get(cfg::ctor_libdir)));
}
append(config.flags.ldflags, getOption(tool_chain, opt::link, "ctor"));
append(config.flags.ldflags, getOption(tool_chain, opt::threads));