From 4bdf53837e010073de802070d4e6087410662d3e Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 24 Aug 2019 17:41:30 +0300
Subject: Move cc build system module to separate library

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

(limited to 'build2/b.cxx')

diff --git a/build2/b.cxx b/build2/b.cxx
index 78f6248..be67a8c 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -54,6 +54,7 @@
 
 #include <libbuild2/in/init.hxx>
 #include <libbuild2/bin/init.hxx>
+#include <libbuild2/cc/init.hxx>
 #include <libbuild2/version/init.hxx>
 
 #ifndef BUILD2_BOOTSTRAP
@@ -63,7 +64,6 @@
 #endif
 
 #include <build2/c/init.hxx>
-#include <build2/cc/init.hxx>
 #include <build2/cxx/init.hxx>
 
 using namespace butl;
@@ -520,16 +520,10 @@ main (int argc, char* argv[])
       load (&install::build2_install_load);
 
       load (&bin::build2_bin_load);
+      load (&cc::build2_cc_load);
       load (&version::build2_version_load);
       load (&in::build2_in_load);
 
-      TMP_LOAD (cc_core_vars, "cc.core.vars", cc::core_vars_init);
-      TMP_LOAD (cc_core_guess, "cc.core.guess", cc::core_guess_init);
-      TMP_LOAD (cc_core_config, "cc.core.config", cc::core_config_init);
-      TMP_LOAD (cc_core, "cc.core", cc::core_init);
-      TMP_LOAD (cc_config, "cc.config", cc::config_init);
-      TMP_LOAD (cc, "cc", cc::init);
-
       TMP_LOAD (c_guess, "c.guess", c::guess_init);
       TMP_LOAD (c_config, "c.config", c::config_init);
       TMP_LOAD (c, "c", c::init);
-- 
cgit v1.1