aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/file.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-08-23 10:11:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-08-23 10:11:48 +0200
commitbf83fe0158f17a9861ac2a9de5593a90453c0ede (patch)
tree8515ca19fedf5a8f47370d67ca34f0239bfe327b /libbuild2/file.cxx
parent18e196372570b32797c1345beea4034a638dfbe6 (diff)
Replace assert with diagnostics in bootstrap_src() (GH issue #322)
Diffstat (limited to 'libbuild2/file.cxx')
-rw-r--r--libbuild2/file.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx
index 1b00662..87658dd 100644
--- a/libbuild2/file.cxx
+++ b/libbuild2/file.cxx
@@ -971,7 +971,16 @@ namespace build2
rs.root_extra->amalgamation = nullptr;
rs.root_extra->subprojects = nullptr;
+ // See GH issue #322.
+ //
+#if 0
assert (!aovr || aovr->empty ());
+#else
+ if (!(!aovr || aovr->empty ()))
+ fail << "amalgamation directory " << *aovr << " specified for simple "
+ << "project " << src_root <<
+ info << "see https://github.com/build2/build2/issues/322 for details";
+#endif
}
// We assume that bootstrap out cannot load this file explicitly. It
// feels wrong to allow this since that makes the whole bootstrap