From 617543ce7cbc706a0e49747be598a7f6a0f7f518 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 13 Apr 2023 13:57:37 +0200 Subject: Load cli module in build2_init() --- bpkg/bpkg.cxx | 4 +++- bpkg/buildfile | 2 +- 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 #include +#include #include #include @@ -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} -- cgit v1.1