aboutsummaryrefslogtreecommitdiff
path: root/build/b.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-07-13 10:01:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-07-13 10:01:36 +0200
commitbef7c36a3479b9b83eaf4be9ef090b21d6468f12 (patch)
tree15a827bd6175a558dc0924b933cf3a6f9f0f9d88 /build/b.cxx
parent4208f2d755f2bd2215051390f6500ccf54f1858f (diff)
Make subprojects list of name=subdir pairs
Diffstat (limited to 'build/b.cxx')
-rw-r--r--build/b.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/build/b.cxx b/build/b.cxx
index 387df1c..36d0b21 100644
--- a/build/b.cxx
+++ b/build/b.cxx
@@ -464,11 +464,8 @@ main (int argc, char* argv[])
{
for (const name& n: v.as<const list_value&> ())
{
- // Should be a list of directories.
- //
- if (!n.type.empty () || !n.value.empty () || n.dir.empty ())
- fail << "expected directory in subprojects variable "
- << "instead of " << n;
+ if (n.pair != '\0')
+ continue; // Skip project names.
if (out_base.sub (out_root / n.dir))
fail << tn << " is in a subproject of " << out_root <<