From ac87e3827b214c0ba1bd1c17a2d8a18026637d3f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 26 Aug 2019 12:06:03 +0300
Subject: Move cxx build system module to separate library

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

(limited to 'build2/b.cxx')

diff --git a/build2/b.cxx b/build2/b.cxx
index 1fd6b5a..a4e799c 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -56,6 +56,7 @@
 #include <libbuild2/bin/init.hxx>
 #include <libbuild2/c/init.hxx>
 #include <libbuild2/cc/init.hxx>
+#include <libbuild2/cxx/init.hxx>
 #include <libbuild2/version/init.hxx>
 
 #ifndef BUILD2_BOOTSTRAP
@@ -64,8 +65,6 @@
 #  include <build2/cli/init.hxx>
 #endif
 
-#include <build2/cxx/init.hxx>
-
 using namespace butl;
 using namespace std;
 
@@ -522,13 +521,10 @@ main (int argc, char* argv[])
       load (&bin::build2_bin_load);
       load (&cc::build2_cc_load);
       load (&c::build2_c_load);
+      load (&cxx::build2_cxx_load);
       load (&version::build2_version_load);
       load (&in::build2_in_load);
 
-      TMP_LOAD (cxx_guess, "cxx.guess", cxx::guess_init);
-      TMP_LOAD (cxx_config, "cxx.config", cxx::config_init);
-      TMP_LOAD (cxx, "cxx", cxx::init);
-
 #ifndef BUILD2_BOOTSTRAP
       TMP_LOAD (cli_config, "cli.config", cli::config_init);
       TMP_LOAD (cli, "cli", cli::init);
-- 
cgit v1.1