From b85b7ad1e985c14d0420002229665c9edda53ab5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 23 Aug 2019 16:27:20 +0200
Subject: Functions

---
 libbuild2/install/functions.cxx | 4 ++--
 libbuild2/install/init.cxx      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'libbuild2/install')

diff --git a/libbuild2/install/functions.cxx b/libbuild2/install/functions.cxx
index f067918..6052dd9 100644
--- a/libbuild2/install/functions.cxx
+++ b/libbuild2/install/functions.cxx
@@ -14,9 +14,9 @@ namespace build2
   namespace install
   {
     void
-    functions ()
+    functions (function_map& m)
     {
-      function_family f ("install");
+      function_family f (m, "install");
 
       // Resolve potentially relative install.* value to an absolute directory
       // based on (other) install.* values visible from the calling scope.
diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx
index dac337f..d2321b5 100644
--- a/libbuild2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -127,7 +127,7 @@ namespace build2
     }
 
     void
-    functions (); // functions.cxx
+    functions (function_map&); // functions.cxx
 
     bool
     boot (scope& rs, const location&, unique_ptr<module_base>&)
@@ -135,11 +135,13 @@ namespace build2
       tracer trace ("install::boot");
       l5 ([&]{trace << "for " << rs;});
 
+      context& ctx (rs.ctx);
+
       // Register install function family if this is the first instance of the
       // install modules.
       //
-      if (!function_family::defined ("install"))
-        functions ();
+      if (!function_family::defined (ctx.functions, "install"))
+        functions (ctx.functions);
 
       // Register our operations.
       //
-- 
cgit v1.1