From 930ae81f85e5ee5ac37311f5e9c89000fbcb59a6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 1 Aug 2019 16:17:09 +0300
Subject: Move bash build system module to separate library

---
 build2/b.cxx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'build2/b.cxx')

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
     }
 
-- 
cgit v1.1