diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-11-14 13:08:29 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-11-14 13:08:29 +0200 |
| commit | b611e797ad9db9794f4d151f454fa731d12b0bd3 (patch) | |
| tree | b202ef1d894a313fb791d5f0af254f67d2ae84b7 /build2/parser.cxx | |
| parent | 6c3d3f62f8560cbb8d1e983a8dd8cc98266bfe37 (diff) | |
Fallback to loading outer buildfile if there isn't one in src_base
This covers the case where the target is defined in the outer buildfile which
is common with non-intrusive project conversions where everything is built
from a single root buildfile.
Diffstat (limited to 'build2/parser.cxx')
| -rw-r--r-- | build2/parser.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index 731ef46..5348fbe 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -1133,14 +1133,14 @@ namespace build2 // path p (move (n.dir)); if (n.value.empty ()) - p /= "buildfile"; + p /= buildfile_file; else { bool d (path::traits::is_separator (n.value.back ())); p /= path (move (n.value)); if (d) - p /= "buildfile"; + p /= buildfile_file; } l6 ([&]{trace (l) << "relative path " << p;}); @@ -3041,7 +3041,7 @@ namespace build2 // const string& s (m.string ()); if ((p[0] != '.' && s[path::traits::find_leaf (s)] == '.') || - (m.to_directory () && exists (*sp / m / buildignore))) + (m.to_directory () && exists (*sp / m / buildignore_file))) return !interm; // Note that we have to make copies of the extension since there will |