aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cxx
diff options
context:
space:
mode:
Diffstat (limited to 'libbuild2/cxx')
-rw-r--r--libbuild2/cxx/init.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx
index 719a88a..e44b6fe 100644
--- a/libbuild2/cxx/init.cxx
+++ b/libbuild2/cxx/init.cxx
@@ -36,8 +36,7 @@ namespace build2
{
public:
explicit
- config_module (config_data&& d)
- : config_data (move (d)), cc::config_module (move (d)) {}
+ config_module (config_data&& d): cc::config_module (move (d)) {}
virtual strings
translate_std (const compiler_info&,
@@ -612,7 +611,11 @@ namespace build2
cast<dir_paths> (rs[cm.x_sys_lib_dirs]),
cast<dir_paths> (rs[cm.x_sys_inc_dirs]),
- cm.x_info->sys_mod_dirs,
+ cm.x_info->sys_mod_dirs ? &cm.x_info->sys_mod_dirs->first : nullptr,
+
+ cm.sys_lib_dirs_mode,
+ cm.sys_inc_dirs_mode,
+ cm.sys_mod_dirs_mode,
cm.sys_lib_dirs_extra,
cm.sys_inc_dirs_extra,