diff options
Diffstat (limited to 'build2/parser.cxx')
| -rw-r--r-- | build2/parser.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index c47cc8b..6b5708e 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -40,7 +40,7 @@ namespace build2 { // Relative scopes are opened relative to out, not src. // - if (d.simple () && d.string () != "." && d.string () != "..") + if (d.simple () && !d.current () && !d.parent ()) { d = dir_path (p.scope_->out_path ()) /= d.string (); n = false; @@ -1797,7 +1797,7 @@ namespace build2 { q = pp ? true : convert<bool> (move (lhs)); } - catch (const invalid_argument& e) { fail (l) << e.what (); } + catch (const invalid_argument& e) { fail (l) << e.what () << endf; } if (!pp) pre_parse_ = !q; // Short-circuit middle? |