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/cc/module.hxx | |
| parent | a9cadecf15385f93ad3eb6b6b0bdeaafd741b0a7 (diff) | |
Add header/library search paths from compiler mode to sys_*_dirs
Diffstat (limited to 'libbuild2/cc/module.hxx')
| -rw-r--r-- | libbuild2/cc/module.hxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/libbuild2/cc/module.hxx b/libbuild2/cc/module.hxx index 5c7b8ab..ae121ef 100644 --- a/libbuild2/cc/module.hxx +++ b/libbuild2/cc/module.hxx @@ -26,7 +26,7 @@ namespace build2 struct compiler_info; class LIBBUILD2_CC_SYMEXPORT config_module: public build2::module, - public virtual config_data + public config_data { public: explicit @@ -55,27 +55,31 @@ namespace build2 const compiler_info* x_info; - // Temporary storage for data::sys_*_dirs_extra. + // Temporary storage for data::sys_*_dirs_*. // + size_t sys_lib_dirs_mode; + size_t sys_inc_dirs_mode; + size_t sys_mod_dirs_mode; + size_t sys_lib_dirs_extra; size_t sys_inc_dirs_extra; private: // Defined in gcc.cxx. // - dir_paths - gcc_header_search_paths (const process_path&, scope&) const; + pair<dir_paths, size_t> + gcc_header_search_dirs (const process_path&, scope&) const; - dir_paths - gcc_library_search_paths (const process_path&, scope&) const; + pair<dir_paths, size_t> + gcc_library_search_dirs (const process_path&, scope&) const; // Defined in msvc.cxx. // - dir_paths - msvc_header_search_paths (const process_path&, scope&) const; + pair<dir_paths, size_t> + msvc_header_search_dirs (const process_path&, scope&) const; - dir_paths - msvc_library_search_paths (const process_path&, scope&) const; + pair<dir_paths, size_t> + msvc_library_search_dirs (const process_path&, scope&) const; private: bool new_; // See guess() and init() for details. |