From f614173d688fd6e57871e1bab5a159e06a2ac07a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 18 Jul 2018 15:38:54 +0200 Subject: Fix test breakages due to nesting checks and amalgamation --- bdep/new.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bdep/new.cxx') diff --git a/bdep/new.cxx b/bdep/new.cxx index 7cdddc8..76bb63b 100644 --- a/bdep/new.cxx +++ b/bdep/new.cxx @@ -170,6 +170,7 @@ namespace bdep // Do some sanity check (nested packages, etc; you would be surprised what // people come up with). // + if (!o.no_checks ()) { project_package pp ( find_project_package (out, true /* ignore_not_found */)); @@ -366,8 +367,10 @@ namespace bdep // build/bootstrap.build // os.open (f = bd / "bootstrap.build"); - os << "project = " << n << endl - << endl + os << "project = " << n << endl; + if (o.no_amalgamation ()) + os << "amalgamation = # Disabled." << endl; + os << endl << "using version" << endl << "using config" << endl; if (tests) -- cgit v1.1