diff options
| -rw-r--r-- | bootstrap-mingw.bat | 2 | ||||
| -rw-r--r-- | bootstrap-msvc.bat | 2 | ||||
| -rw-r--r-- | bootstrap.gmake | 4 | ||||
| -rw-r--r-- | build2/b.cxx | 9 |
4 files changed, 7 insertions, 10 deletions
diff --git a/bootstrap-mingw.bat b/bootstrap-mingw.bat index 8f5f0e7..b677638 100644 --- a/bootstrap-mingw.bat +++ b/bootstrap-mingw.bat @@ -67,13 +67,11 @@ set "src=%src% build2\bin\*.cxx" set "src=%src% build2\c\*.cxx" set "src=%src% build2\cc\*.cxx" set "src=%src% build2\cxx\*.cxx" -set "src=%src% build2\cli\*.cxx" set "src=%src% build2\test\*.cxx" set "src=%src% build2\test\script\*.cxx" set "src=%src% build2\version\*.cxx" set "src=%src% build2\install\*.cxx" set "src=%src% build2\in\*.cxx" -set "src=%src% build2\bash\*.cxx" set "src=%src% %libbutl%\libbutl\*.cxx" rem Get the compile options. diff --git a/bootstrap-msvc.bat b/bootstrap-msvc.bat index ffbbee2..ad2d3a7 100644 --- a/bootstrap-msvc.bat +++ b/bootstrap-msvc.bat @@ -98,13 +98,11 @@ set "src=%src% build2\bin" set "src=%src% build2\c" set "src=%src% build2\cc" set "src=%src% build2\cxx" -set "src=%src% build2\cli" set "src=%src% build2\test" set "src=%src% build2\test\script" set "src=%src% build2\version" set "src=%src% build2\install" set "src=%src% build2\in" -set "src=%src% build2\bash" set "src=%src% %libbutl%\libbutl" rem Get the compile options. diff --git a/bootstrap.gmake b/bootstrap.gmake index 493befd..e06c5ec 100644 --- a/bootstrap.gmake +++ b/bootstrap.gmake @@ -136,13 +136,11 @@ bin \ c \ cc \ cxx \ -cli \ test/script \ test \ version \ install \ -in \ -bash +in build2_src := $(wildcard $(src_root)/build2/*.cxx) build2_src += $(foreach d,$(sub_dirs),$(wildcard $(src_root)/build2/$d/*.cxx)) 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 (); |