1 files changed, 23 insertions, 16 deletions

diff --git a/libbuild2/cc/compile-rule.hxx b/libbuild2/cc/compile-rule.hxx
index dbb2dd5..0886b4b 100644
--- a/libbuild2/cc/compile-rule.hxx
+++ b/libbuild2/cc/compile-rule.hxx
@@ -22,6 +22,8 @@ namespace build2
 
   namespace cc
   {
+    class config_module;
+
     // The order is arranged so that their integral values indicate whether
     // one is a "stronger" than another.
     //
@@ -42,19 +44,21 @@ namespace build2
                                                dyndep_rule
     {
     public:
-      compile_rule (data&&);
+      struct match_data;
+
+      compile_rule (data&&, const scope&);
 
       virtual bool
-      match (action, target&, const string&) const override;
+      match (action, target&) const override;
 
       virtual recipe
       apply (action, target&) const override;
 
       target_state
-      perform_update (action, const target&) const;
+      perform_update (action, const target&, match_data&) const;
 
       target_state
-      perform_clean (action, const target&) const;
+      perform_clean (action, const target&, const target_type&) const;
 
     public:
       using appended_libraries = small_vector<const target*, 256>;
@@ -62,7 +66,8 @@ namespace build2
       void
       append_library_options (appended_libraries&, strings&,
                               const scope&,
-                              action, const file&, bool, linfo) const;
+                              action, const file&, bool, linfo,
+                              bool, bool) const;
 
       optional<path>
       find_system_header (const path&) const;
@@ -72,7 +77,6 @@ namespace build2
       functions (function_family&, const char*); // functions.cxx
 
     private:
-      struct match_data;
       using environment = small_vector<const char*, 2>;
 
       template <typename T>
@@ -84,7 +88,7 @@ namespace build2
       append_library_options (appended_libraries&, T&,
                               const scope&,
                               const scope*,
-                              action, const file&, bool, linfo,
+                              action, const file&, bool, linfo, bool,
                               library_cache*) const;
 
       template <typename T>
@@ -109,27 +113,28 @@ namespace build2
       prefix_map
       build_prefix_map (const scope&, action, const target&, linfo) const;
 
-      struct module_mapper_state;
+      struct gcc_module_mapper_state;
 
-      bool
-      gcc_module_mapper (module_mapper_state&,
+      optional<bool>
+      gcc_module_mapper (gcc_module_mapper_state&,
                          action, const scope&, file&, linfo,
-                         ifdstream&, ofdstream&,
+                         const string&, ofdstream&,
                          depdb&, bool&, bool&,
                          optional<prefix_map>&, srcout_map&) const;
 
       pair<const file*, bool>
       enter_header (action, const scope&, file&, linfo,
-                    path&, bool, bool,
+                    path&&, bool, bool,
                     optional<prefix_map>&, const srcout_map&) const;
 
       optional<bool>
       inject_header (action, file&, const file&, timestamp, bool) const;
 
-      pair<file_cache::entry, bool>
+      void
       extract_headers (action, const scope&, file&, linfo,
                        const file&, match_data&,
-                       depdb&, bool&, timestamp, module_imports&) const;
+                       depdb&, bool&, timestamp, module_imports&,
+                       pair<file_cache::entry, bool>&) const;
 
       string
       parse_unit (action, file&, linfo,
@@ -151,8 +156,9 @@ namespace build2
       pair<dir_path, const scope&>
       find_modules_sidebuild (const scope&) const;
 
-      const file&
-      make_module_sidebuild (action, const scope&, const file&,
+      pair<target&, ulock>
+      make_module_sidebuild (action, const scope&,
+                             const file*, otype,
                              const target&, const string&) const;
 
       const file&
@@ -180,6 +186,7 @@ namespace build2
 
     private:
       const string rule_id;
+      const config_module* header_cache_;
     };
   }
 }