summaryrefslogtreecommitdiff
path: root/src/externals_manual.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2023-01-12 15:49:16 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2023-01-12 15:59:22 +0100
commitc093758b4688fb5bae2cc7727b6c9b52b824043e (patch)
treef92c206b0fa6366319e17f1c7f375dfeb0ab5f27 /src/externals_manual.cc
parentcc4e14d243f4e7e1ad487d8865c5ffc8423e473d (diff)
Move tools opt to ctor.h and rename tool_chain to toolchain for consistency.
Diffstat (limited to 'src/externals_manual.cc')
-rw-r--r--src/externals_manual.cc8
1 files changed, 4 insertions, 4 deletions
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<std::string, std::string> 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;