diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-02-03 14:51:43 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-02-03 14:51:43 +0200 |
| commit | 1195f9307c425ed28075a17671c13676b65f4a43 (patch) | |
| tree | 6014ef54bb736a2949eb1f31a63a95d336fffd9b /libbuild2/cxx | |
| parent | a9cadecf15385f93ad3eb6b6b0bdeaafd741b0a7 (diff) | |
Add header/library search paths from compiler mode to sys_*_dirs
Diffstat (limited to 'libbuild2/cxx')
| -rw-r--r-- | libbuild2/cxx/init.cxx | 9 |
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, |