From b611e797ad9db9794f4d151f454fa731d12b0bd3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 14 Nov 2018 13:08:29 +0200 Subject: Fallback to loading outer buildfile if there isn't one in src_base This covers the case where the target is defined in the outer buildfile which is common with non-intrusive project conversions where everything is built from a single root buildfile. --- build2/file.cxx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'build2/file.cxx') diff --git a/build2/file.cxx b/build2/file.cxx index 3f0e7b7..51bb810 100644 --- a/build2/file.cxx +++ b/build2/file.cxx @@ -24,15 +24,15 @@ using namespace butl; namespace build2 { - const dir_path build_dir ("build"); - const dir_path root_dir (dir_path (build_dir) /= "root"); + const dir_path build_dir ("build"); + const dir_path root_dir (dir_path (build_dir) /= "root"); const dir_path bootstrap_dir (dir_path (build_dir) /= "bootstrap"); - const path root_file (build_dir / "root.build"); - const path bootstrap_file (build_dir / "bootstrap.build"); - const path src_root_file (bootstrap_dir / "src-root.build"); - const path out_root_file (bootstrap_dir / "out-root.build"); - const path export_file (build_dir / "export.build"); + const path root_file (build_dir / "root.build"); + const path bootstrap_file (build_dir / "bootstrap.build"); + const path src_root_file (bootstrap_dir / "src-root.build"); + const path out_root_file (bootstrap_dir / "out-root.build"); + const path export_file (build_dir / "export.build"); // While strictly speaking it belongs in, say, config/module.cxx, the static // initialization order strikes again. If we ever make the config module @@ -40,6 +40,8 @@ namespace build2 // const path config_file (build_dir / "config.build"); + const path buildfile_file ("buildfile"); + ostream& operator<< (ostream& os, const subprojects& sps) { -- cgit v1.1