Move tools opt to ctor.h and rename tool_chain to toolchain for consistency.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/rebuild.cc b/src/rebuild.cc
index 0d610b5..dec7119 100644
--- a/src/rebuild.cc
+++ b/src/rebuild.cc
@@ -162,27 +162,27 @@ bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[
 	config.name = "ctor";
 	config.system = ctor::output_system::build;
 
-	auto tool_chain = getToolChain(config.system);
+	auto toolchain = getToolChain(config.system);
 
 	append(config.flags.cxxflags,
-	       getOption(tool_chain, opt::optimization, "3"));
+	       getOption(toolchain, ctor::opt::optimization, "3"));
 	append(config.flags.cxxflags,
-	       getOption(tool_chain, opt::cpp_std, "c++20"));
+	       getOption(toolchain, ctor::opt::cpp_std, "c++20"));
 	const auto& c = ctor::get_configuration();
 	if(c.has(ctor::cfg::ctor_includedir))
 	{
 		append(config.flags.cxxflags,
-		       getOption(tool_chain, opt::include_path,
+		       getOption(toolchain, ctor::opt::include_path,
 		                 c.get(ctor::cfg::ctor_includedir)));
 	}
 	if(c.has(ctor::cfg::ctor_libdir))
 	{
 		append(config.flags.ldflags,
-		       getOption(tool_chain, opt::library_path,
+		       getOption(toolchain, ctor::opt::library_path,
 		                 c.get(ctor::cfg::ctor_libdir)));
 	}
-	append(config.flags.ldflags, getOption(tool_chain, opt::link, "ctor"));
-	append(config.flags.ldflags, getOption(tool_chain, opt::threads));
+	append(config.flags.ldflags, getOption(toolchain, ctor::opt::link, "ctor"));
+	append(config.flags.ldflags, getOption(toolchain, ctor::opt::threads));
 
 	ctor::settings settings{global_settings};
 	settings.verbose = -1; // Make check completely silent.