From 1195f9307c425ed28075a17671c13676b65f4a43 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 3 Feb 2020 14:51:43 +0200
Subject: Add header/library search paths from compiler mode to sys_*_dirs

---
 libbuild2/cxx/init.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'libbuild2/cxx')

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,
-- 
cgit v1.1