diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2025-01-03 12:01:53 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2025-01-08 10:46:48 +0200 |
commit | 6f78cb4299698aca908156d0090869676ee66b23 (patch) | |
tree | 658d147b5aa3371adae6ac64246382e81a9af568 /libbuild2 | |
parent | 2a8a33a10755678fdf3d27267615a1eb576175e7 (diff) |
Diffstat (limited to 'libbuild2')
-rw-r--r-- | libbuild2/parser.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx index e6fd5bb..4242b96 100644 --- a/libbuild2/parser.cxx +++ b/libbuild2/parser.cxx @@ -7264,7 +7264,9 @@ namespace build2 (root_ != nullptr && root_->root_extra != nullptr && m.to_directory () && - exists (d.sp / m / root_->root_extra->buildignore_file))) + exists (m.relative () + ? d.sp / m / root_->root_extra->buildignore_file + : m / root_->root_extra->buildignore_file))) return !interm; // Note that we have to make copies of the extension since there will @@ -7320,9 +7322,11 @@ namespace build2 return true; }); + path pat (move (p)); + try { - path_search (path (move (p)), + path_search (pat, process, *sp, path_match_flags::follow_symlinks, @@ -7330,7 +7334,8 @@ namespace build2 } catch (const system_error& e) { - fail (l) << "unable to scan " << *sp << ": " << e; + fail (l) << "unable to scan for '" + << (pat.relative () ? *sp / pat : pat) << "': " << e; } }; |