From 239f0bc9b5e72f632aa3d65a45b745d6c9df9b70 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 21 Feb 2022 07:38:47 +0200
Subject: Do lazy build system initialization only if/when actually needed

---
 bpkg/pkg-build.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'bpkg/pkg-build.cxx')

diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx
index f4eef42..24b928a 100644
--- a/bpkg/pkg-build.cxx
+++ b/bpkg/pkg-build.cxx
@@ -1308,7 +1308,8 @@ namespace bpkg
           ? dir_path (pdb.config) /= pkg.name ().string ()
           : optional<dir_path> ());
 
-        pkg.skeleton = package_skeleton (pdb,
+        pkg.skeleton = package_skeleton (options,
+                                         pdb,
                                          *ap,
                                          pkg.config_vars,
                                          move (src_root),
@@ -8148,7 +8149,8 @@ namespace bpkg
                          t,
                          sp,
                          ap->dependencies,
-                         package_skeleton (pdb,
+                         package_skeleton (o,
+                                           pdb,
                                            *ap,
                                            move (p.config_vars),
                                            move (src_root),
@@ -8192,7 +8194,8 @@ namespace bpkg
                        t,
                        sp,
                        dap->dependencies,
-                       package_skeleton (pdb,
+                       package_skeleton (o,
+                                         pdb,
                                          *dap,
                                          move (p.config_vars),
                                          move (src_root),
-- 
cgit v1.1