aboutsummaryrefslogtreecommitdiff
path: root/bdep/new.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-07-18 15:38:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-07-18 15:38:54 +0200
commitf614173d688fd6e57871e1bab5a159e06a2ac07a (patch)
tree2fb1b0f4cbdf8cda877b69f1dfdddfcb6b312993 /bdep/new.cxx
parentcb17adc24f95042976972c68b37e136306af8d38 (diff)
Fix test breakages due to nesting checks and amalgamation
Diffstat (limited to 'bdep/new.cxx')
-rw-r--r--bdep/new.cxx7
1 files changed, 5 insertions, 2 deletions
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)