aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/c
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-02-03 14:51:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-02-03 14:51:43 +0200
commit1195f9307c425ed28075a17671c13676b65f4a43 (patch)
tree6014ef54bb736a2949eb1f31a63a95d336fffd9b /libbuild2/c
parenta9cadecf15385f93ad3eb6b6b0bdeaafd741b0a7 (diff)
Add header/library search paths from compiler mode to sys_*_dirs
Diffstat (limited to 'libbuild2/c')
-rw-r--r--libbuild2/c/init.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/libbuild2/c/init.cxx b/libbuild2/c/init.cxx
index 5939d4c..c72f729 100644
--- a/libbuild2/c/init.cxx
+++ b/libbuild2/c/init.cxx
@@ -35,8 +35,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&,
@@ -345,7 +344,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,