From 85b7dc75597386777ebe1f7158e798eff968a4bf Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 2 Feb 2022 09:01:00 +0200
Subject: Re-enable linking of libbuild2

---
 bpkg/bpkg.cxx  |  6 +-----
 bpkg/buildfile | 10 +++-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index 6abf866..e9cb1d0 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -14,7 +14,6 @@
 
 // Embedded build system driver.
 //
-#if 0
 #include <libbuild2/types.hxx>
 #include <libbuild2/utility.hxx>
 
@@ -25,7 +24,6 @@
 #include <libbuild2/cxx/init.hxx>
 #include <libbuild2/bash/init.hxx>
 #include <libbuild2/version/init.hxx>
-#endif
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
@@ -203,7 +201,7 @@ static const size_t args_pos (numeric_limits<size_t>::max () / 2);
 //
 template <typename O>
 static O
-init (const char* /*argv0*/,
+init (const char* argv0,
       const common_options& co,
       cli::group_scanner& scan,
       strings& args, cli::vector_scanner& args_scan,
@@ -391,7 +389,6 @@ init (const char* /*argv0*/,
   //
   // @@ TODO: perhaps we should only do it for commands that need it?
   //
-#if 0
   {
     // @@ TMP: pass proper values instead of dummies.
     //
@@ -405,7 +402,6 @@ init (const char* /*argv0*/,
     build2::version::build2_version_load ();
     build2::in::build2_in_load ();
   }
-#endif
 
   return o;
 }
diff --git a/bpkg/buildfile b/bpkg/buildfile
index 928bd35..cc9e7b5 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -8,16 +8,12 @@
 define xml: file
 xml{*}: extension = xml
 
-libs =
-
-# @@ TMP
-#
-#import libs = build2%lib{build2}
+import libs = build2%lib{build2}
 
 # NOTE: see also module loading in bpkg.cxx if adding anything here.
 #
-#for m: bin c cc cxx in version
-#  import libs += build2%lib{build2-$m}
+for m: bin c cc cxx in version
+  import libs += build2%lib{build2-$m}
 
 import libs += libbpkg%lib{bpkg}
 import libs += libbutl%lib{butl}
-- 
cgit v1.1