From c699c956d75dfaaded5bb24c5ea16edc73588649 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 27 Mar 2015 16:14:10 +0200 Subject: Rework dependency state dump support We now have a combined (scopes, variables, and targets) dump. --- build/cxx/rule.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build/cxx') diff --git a/build/cxx/rule.cxx b/build/cxx/rule.cxx index f53dd3b..549d987 100644 --- a/build/cxx/rule.cxx +++ b/build/cxx/rule.cxx @@ -282,8 +282,8 @@ namespace build // Translate paths to relative (to working directory) ones. This // results in easier to read diagnostics. // - path ro (relative_work (o.path ())); - path rs (relative_work (s->path ())); + path ro (relative (o.path ())); + path rs (relative (s->path ())); const char* args[] = { "g++-4.9", @@ -580,7 +580,7 @@ namespace build // Translate paths to relative (to working directory) ones. This // results in easier to read diagnostics. // - path re (relative_work (e.path ())); + path re (relative (e.path ())); vector ro; vector args {"g++-4.9", "-std=c++14", "-g", "-o"}; @@ -591,7 +591,7 @@ namespace build { if (const obj* o = dynamic_cast (p.target)) { - ro.push_back (relative_work (o->path ())); + ro.push_back (relative (o->path ())); args.push_back (ro.back ().string ().c_str ()); } } -- cgit v1.1