diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-23 09:17:48 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-23 09:17:48 +0200 |
| commit | 1b1d1434539c4c198caab4f3a45ade9e6827427b (patch) | |
| tree | ea16012a180341af8d0771e6febdcd8ecb4d4714 /build2/cxx/compile.cxx | |
| parent | decfe7243b6eedb4ed3d1ac5005345745e5fce61 (diff) | |
Revert back to using root scope in src_out()/out_src()
Relaxing it to base was not wise since we can have "sideways"
prerequisites (those from parallel directories such as brep's ../web/*).
Diffstat (limited to 'build2/cxx/compile.cxx')
| -rw-r--r-- | build2/cxx/compile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx index a7986c5..a0b4f3a 100644 --- a/build2/cxx/compile.cxx +++ b/build2/cxx/compile.cxx @@ -687,12 +687,12 @@ namespace build2 dir_path out; scope& bs (scopes.find (d)); - if (bs.root_scope () != nullptr) + if (scope* rs = bs.root_scope ()) { tt = map_extension (bs, n, *e); if (bs.out_path () != bs.src_path () && d.sub (bs.src_path ())) - out = out_src (d, bs); + out = out_src (d, *rs); } // If it is outside any project, or the project doesn't have |