From ea69747ba2b371e0e3b1e9ecb044e7d815fbea21 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 25 Jul 2018 14:29:11 +0200
Subject: Exclude cli and bash modules from bootstrap build

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

(limited to 'build2')

diff --git a/build2/b.cxx b/build2/b.cxx
index 0f2a928..de4ee0c 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -57,9 +57,10 @@ using namespace std;
 #include <build2/cc/init.hxx>
 #include <build2/cxx/init.hxx>
 
-#include <build2/cli/init.hxx>
-
-#include <build2/bash/init.hxx>
+#ifndef BUILD2_BOOTSTRAP
+#  include <build2/cli/init.hxx>
+#  include <build2/bash/init.hxx>
+#endif
 
 namespace build2
 {
@@ -419,10 +420,12 @@ main (int argc, char* argv[])
       bm["cxx.config"] = mf {nullptr, &cxx::config_init};
       bm["cxx"] = mf {nullptr, &cxx::init};
 
+#ifndef BUILD2_BOOTSTRAP
       bm["cli.config"] = mf {nullptr, &cli::config_init};
       bm["cli"] = mf {nullptr, &cli::init};
 
       bm["bash"] = mf {nullptr, &bash::init};
+#endif
     }
 
     keep_going = !ops.serial_stop ();
-- 
cgit v1.1