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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/task_ld.cc b/src/task_ld.cc
index 916f3ff..4915de9 100644
--- a/src/task_ld.cc
+++ b/src/task_ld.cc
@@ -82,7 +82,7 @@ bool TaskLD::dirtyInner()
 
 int TaskLD::runInner()
 {
-	auto tool_chain = getToolChain(config.system);
+	auto toolchain = getToolChain(config.system);
 
 	std::vector<std::string> args;
 	for(const auto& dep : getDependsTasks())
@@ -90,10 +90,10 @@ int TaskLD::runInner()
 		auto depFile = dep->targetFile();
 		if(depFile.extension() == ".so")
 		{
-			append(args, getOption(tool_chain, opt::library_path,
+			append(args, getOption(toolchain, ctor::opt::library_path,
 			                       targetFile().parent_path().string()));
 			auto lib = depFile.stem().string().substr(3); // strip 'lib' prefix
-			append(args, getOption(tool_chain, opt::link, lib));
+			append(args, getOption(toolchain, ctor::opt::link, lib));
 		}
 		else if(depFile.extension() == ".a" || depFile.extension() == ".o")
 		{
@@ -102,7 +102,7 @@ int TaskLD::runInner()
 	}
 
 	append(args, config.flags.ldflags);
-	append(args, getOption(tool_chain, opt::output, targetFile().string()));
+	append(args, getOption(toolchain, ctor::opt::output, targetFile().string()));
 
 	{ // Write flags to file.
 		std::ofstream flagsStream(flagsFile);