From 1b1d1434539c4c198caab4f3a45ade9e6827427b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 23 Apr 2016 09:17:48 +0200 Subject: 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/*). --- build2/cxx/compile.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build2/cxx/compile.cxx') 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 -- cgit v1.1