From a7869c0bd65faacdd008284df9ab07de7df3d445 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 21 Nov 2021 11:13:28 +0100 Subject: Bundle flags in struct for easier passing around. --- src/rebuild.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/rebuild.cc') diff --git a/src/rebuild.cc b/src/rebuild.cc index ff61695..50d7540 100644 --- a/src/rebuild.cc +++ b/src/rebuild.cc @@ -144,17 +144,18 @@ bool recompileCheck(const Settings& global_settings, int argc, char* argv[], BuildConfiguration config; config.name = "ctor"; - config.cxxflags = std::vector({ "-s", "-O3", "-std=c++20" }); + config.flags.cxxflags = + std::vector({ "-s", "-O3", "-std=c++20" }); if(hasConfiguration(cfg::ctor_includedir)) { - config.cxxflags.push_back("-I"s + getConfiguration(cfg::ctor_includedir)); + config.flags.cxxflags.push_back("-I"s + getConfiguration(cfg::ctor_includedir)); } if(hasConfiguration(cfg::ctor_libdir)) { - config.ldflags.push_back("-L"s + getConfiguration(cfg::ctor_libdir)); + config.flags.ldflags.push_back("-L"s + getConfiguration(cfg::ctor_libdir)); } - config.ldflags.push_back("-lctor"); - config.ldflags.push_back("-pthread"); + config.flags.ldflags.push_back("-lctor"); + config.flags.ldflags.push_back("-pthread"); Settings settings{global_settings}; -- cgit v1.2.3