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/config | |
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/config')
-rw-r--r-- | build2/config/operation.cxx | 4 | ||||
-rw-r--r-- | build2/config/utility.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx index 0d256a6..1dc51b6 100644 --- a/build2/config/operation.cxx +++ b/build2/config/operation.cxx @@ -471,6 +471,7 @@ namespace build2 configure_search (const values& params, const scope& root, const scope& base, + const path& bf, const target_key& tk, const location& l, action_targets& ts) @@ -483,7 +484,7 @@ namespace build2 ts.push_back (&root); } else - search (params, root, base, tk, l, ts); // Normal search. + search (params, root, base, bf, tk, l, ts); // Normal search. } static void @@ -751,6 +752,7 @@ namespace build2 disfigure_search (const values&, const scope& root, const scope&, + const path&, const target_key&, const location&, action_targets& ts) diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx index 976e46f..005be41 100644 --- a/build2/config/utility.cxx +++ b/build2/config/utility.cxx @@ -281,7 +281,7 @@ namespace build2 // if (buildfile) { - path f (d / "buildfile"); + path f (d / buildfile_file); if (verb >= verbosity) text << (verb >= 2 ? "cat >" : "save ") << f; |