From c093758b4688fb5bae2cc7727b6c9b52b824043e Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 12 Jan 2023 15:49:16 +0100 Subject: Move tools opt to ctor.h and rename tool_chain to toolchain for consistency. --- src/externals_manual.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/externals_manual.cc') diff --git a/src/externals_manual.cc b/src/externals_manual.cc index d6b519b..bc8e9d0 100644 --- a/src/externals_manual.cc +++ b/src/externals_manual.cc @@ -16,21 +16,21 @@ extern std::map external_libdir; int resolv(const ctor::settings& settings, const ctor::external_configuration& config, const ctor::external_manual& ext, ctor::flags& flags) { - auto tool_chain = getToolChain(config.system); + auto toolchain = getToolChain(config.system); flags = ext.flags; auto inc = external_includedir.find(config.name); if(inc != external_includedir.end()) { - append(flags.cflags, getOption(tool_chain, opt::include_path, inc->second)); - append(flags.cxxflags, getOption(tool_chain, opt::include_path, inc->second)); + append(flags.cflags, getOption(toolchain, ctor::opt::include_path, inc->second)); + append(flags.cxxflags, getOption(toolchain, ctor::opt::include_path, inc->second)); } auto lib = external_libdir.find(config.name); if(lib != external_libdir.end()) { - append(flags.ldflags, getOption(tool_chain, opt::library_path, lib->second)); + append(flags.ldflags, getOption(toolchain, ctor::opt::library_path, lib->second)); } return 0; -- cgit v1.2.3