aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-04-13 13:57:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-04-13 13:57:37 +0200
commit617543ce7cbc706a0e49747be598a7f6a0f7f518 (patch)
tree035bc8db3f964f4ce6daa121467687cca5c93469
parent863dc3baae48909d843cf826446c67ab5767224e (diff)
Load cli module in build2_init()
-rw-r--r--bpkg/bpkg.cxx4
-rw-r--r--bpkg/buildfile2
2 files changed, 4 insertions, 2 deletions
diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index fa294c5..4af4140 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -34,6 +34,7 @@
#include <libbuild2/version/init.hxx>
#include <libbuild2/bash/init.hxx>
+#include <libbuild2/cli/init.hxx>
#include <bpkg/types.hxx>
#include <bpkg/utility.hxx>
@@ -195,7 +196,8 @@ namespace bpkg
load_builtin_module (&build2::version::build2_version_load);
load_builtin_module (&build2::in::build2_in_load);
- load_builtin_module (&bash::build2_bash_load);
+ load_builtin_module (&build2::bash::build2_bash_load);
+ load_builtin_module (&build2::cli::build2_cli_load);
// Note that while all we need is serial execution (all we do is load),
// in the process we may need to update some build system modules (while
diff --git a/bpkg/buildfile b/bpkg/buildfile
index e64e413..19fd4dc 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -12,7 +12,7 @@ import libs = build2%lib{build2}
# NOTE: see also module loading in bpkg.cxx if adding anything here.
#
-for m: bash bin c cc cxx in version
+for m: bash bin c cc cli cxx in version
import libs += build2%lib{build2-$m}
import libs += libbpkg%lib{bpkg}