Bundle flags in struct for easier passing around.

1 files changed, 6 insertions, 5 deletions

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<std::string>({ "-s", "-O3", "-std=c++20" });
+	config.flags.cxxflags =
+		std::vector<std::string>({ "-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};