aboutsummaryrefslogtreecommitdiff
path: root/build/cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-03-27 16:14:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-03-27 16:14:10 +0200
commitc699c956d75dfaaded5bb24c5ea16edc73588649 (patch)
tree168245560a535714c841ded6640b69b22bf7b08d /build/cxx
parent9c02d307d69faa6e3c7056d8e07f16c75c189f92 (diff)
Rework dependency state dump support
We now have a combined (scopes, variables, and targets) dump.
Diffstat (limited to 'build/cxx')
-rw-r--r--build/cxx/rule.cxx8
1 files changed, 4 insertions, 4 deletions
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<path> ro;
vector<const char*> args {"g++-4.9", "-std=c++14", "-g", "-o"};
@@ -591,7 +591,7 @@ namespace build
{
if (const obj* o = dynamic_cast<const obj*> (p.target))
{
- ro.push_back (relative_work (o->path ()));
+ ro.push_back (relative (o->path ()));
args.push_back (ro.back ().string ().c_str ());
}
}