From 2905180c48e4b8974d4dee1949a00fc8e7bcafc6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 5 Apr 2023 08:07:47 +0200
Subject: Allow creating context with bare minimum of initializations

This is used by bpkg to detect forwarded configurations without incurring
the full context creation overhead.
---
 libbuild2/cc/compile-rule.cxx | 8 ++++----
 libbuild2/cc/link-rule.cxx    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index e76cb7c..7a357d9 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -3449,7 +3449,7 @@ namespace build2
 
               msvc_sanitize_cl (args);
 
-              psrc = ctx.fcache.create (t.path () + pext, !modules);
+              psrc = ctx.fcache->create (t.path () + pext, !modules);
 
               if (fc)
               {
@@ -3601,7 +3601,7 @@ namespace build2
 
                 // Preprocessor output.
                 //
-                psrc = ctx.fcache.create (t.path () + pext, !modules);
+                psrc = ctx.fcache->create (t.path () + pext, !modules);
                 args.push_back ("-o");
                 args.push_back (psrc.path ().string ().c_str ());
               }
@@ -3896,7 +3896,7 @@ namespace build2
               if (modules && (ctype != compiler_type::msvc ||
                               md.type != unit_type::module_intf))
               {
-                result.first = ctx.fcache.create_existing (t.path () + pext);
+                result.first = ctx.fcache->create_existing (t.path () + pext);
                 result.second = true;
               }
 
@@ -7521,7 +7521,7 @@ namespace build2
 
       // Compressed preprocessed file extension.
       //
-      string cpext (t.ctx.fcache.compressed_extension (pext));
+      string cpext (t.ctx.fcache->compressed_extension (pext));
 
       clean_extras extras;
       switch (ctype)
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index f860fdc..490e0b4 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -3964,7 +3964,7 @@ namespace build2
             auto i (find_option_prefix ("-flto", args.rbegin (), args.rend ()));
             if (i != args.rend () && strcmp (*i, "-flto=auto") == 0)
             {
-              jobs_extra = scheduler::alloc_guard (ctx.sched, 0);
+              jobs_extra = scheduler::alloc_guard (*ctx.sched, 0);
               jobs_arg = "-flto=" + to_string (1 + jobs_extra.n);
               *i = jobs_arg.c_str ();
             }
@@ -3983,7 +3983,7 @@ namespace build2
                 strcmp (*i, "-flto=thin") == 0 &&
                 !find_option_prefix ("-flto-jobs=", args))
             {
-              jobs_extra = scheduler::alloc_guard (ctx.sched, 0);
+              jobs_extra = scheduler::alloc_guard (*ctx.sched, 0);
               jobs_arg = "-flto-jobs=" + to_string (1 + jobs_extra.n);
               args.insert (i.base (), jobs_arg.c_str ()); // After -flto=thin.
             }
-- 
cgit v1.1