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

---
 bootstrap.gmake | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'bootstrap.gmake')

diff --git a/bootstrap.gmake b/bootstrap.gmake
index 0e3126e..0587004 100644
--- a/bootstrap.gmake
+++ b/bootstrap.gmake
@@ -129,9 +129,6 @@ endif
 #
 # Note: list nested subdirectories first (used in clean).
 #
-build2_sub := \
-cxx
-
 libbuild2_sub := \
 config           \
 dist             \
@@ -141,11 +138,11 @@ install          \
 bin              \
 c                \
 cc               \
+cxx              \
 version          \
 in
 
 build2_src    := $(wildcard $(src_root)/build2/*.cxx)
-build2_src    += $(foreach d,$(build2_sub),$(wildcard $(src_root)/build2/$d/*.cxx))
 libbuild2_src := $(wildcard $(src_root)/libbuild2/*.cxx)
 libbuild2_src += $(foreach d,$(libbuild2_sub),$(wildcard $(src_root)/libbuild2/$d/*.cxx))
 libbutl_src   := $(wildcard $(libbutl)/libbutl/*.cxx)
@@ -196,5 +193,5 @@ cleano:
 clean: cleano
 	rm -f $(out_root)/build2/b-boot$(exe)
 ifeq ($(in_tree),false)
-	rm -fd $(foreach d,$(build2_sub),$(out_root)/build2/$d) $(out_root)/build2 $(foreach d,$(libbuild2_sub),$(out_root)/libbuild2/$d) $(out_root)/libbuild2 $(libbutl_out)
+	rm -fd $(out_root)/build2 $(foreach d,$(libbuild2_sub),$(out_root)/libbuild2/$d) $(out_root)/libbuild2 $(libbutl_out)
 endif
-- 
cgit v1.1