aboutsummaryrefslogtreecommitdiff
path: root/build2/b.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-08-01 16:17:09 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-08-01 16:41:08 +0300
commit930ae81f85e5ee5ac37311f5e9c89000fbcb59a6 (patch)
treed14c8a341f16fb6c485bfa4212bc1002fe52ed6b /build2/b.cxx
parentda9cbf29c403d27c2940f9b31199c4648f8ae4a1 (diff)
Move bash build system module to separate library
Diffstat (limited to 'build2/b.cxx')
-rw-r--r--build2/b.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index a016278..2bb5920 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -54,16 +54,17 @@
#include <libbuild2/in/init.hxx>
#include <libbuild2/version/init.hxx>
+#ifndef BUILD2_BOOTSTRAP
+# include <libbuild2/bash/init.hxx>
+
+# include <build2/cli/init.hxx>
+#endif
+
#include <build2/bin/init.hxx>
#include <build2/c/init.hxx>
#include <build2/cc/init.hxx>
#include <build2/cxx/init.hxx>
-#ifndef BUILD2_BOOTSTRAP
-# include <build2/cli/init.hxx>
-# include <build2/bash/init.hxx>
-#endif
-
using namespace butl;
using namespace std;
@@ -481,7 +482,7 @@ main (int argc, char* argv[])
bm["cli.config"] = mf {"cli.config", nullptr, &cli::config_init};
bm["cli"] = mf {"cli", nullptr, &cli::init};
- bm["bash"] = mf {"bash", nullptr, &bash::init};
+ reg (&bash::build2_bash_load);
#endif
}