From dee4003df645803a7883fd7b97dab7ca6b1f79ae Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 27 Aug 2019 23:51:46 +0300
Subject: Add build2_cli_load()

---
 build2/b.cxx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'build2/b.cxx')

diff --git a/build2/b.cxx b/build2/b.cxx
index a4e799c..d6b364d 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -507,12 +507,6 @@ main (int argc, char* argv[])
           loaded_modules[i->name] = i;
       };
 
-      // @@ TMP
-      //
-#define TMP_LOAD(N, S, I)                                 \
-        static const module_functions N {S, nullptr, &I};  \
-        loaded_modules[S] = &N
-
       load (&config::build2_config_load);
       load (&dist::build2_dist_load);
       load (&test::build2_test_load);
@@ -526,9 +520,7 @@ main (int argc, char* argv[])
       load (&in::build2_in_load);
 
 #ifndef BUILD2_BOOTSTRAP
-      TMP_LOAD (cli_config, "cli.config", cli::config_init);
-      TMP_LOAD (cli, "cli", cli::init);
-
+      load (&cli::build2_cli_load);
       load (&bash::build2_bash_load);
 #endif
     }
-- 
cgit v1.1