diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-11-09 06:49:21 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2014-11-09 06:49:21 (GMT) |
| commit | 559389de082406f44ae752a2494e53000d31a7df (patch) | |
| tree | 3b82939a355ae91662c605b35e739e7f032db6e6 /src/build.cc | |
| parent | 8177085f4d3adf78b9709069a9c3ce5fe442867a (diff) | |
| download | Ninja-559389de082406f44ae752a2494e53000d31a7df.zip Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.gz Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.bz2 | |
remove CanonicalizePath overloads, test for toplevel behaviour
Diffstat (limited to 'src/build.cc')
| -rw-r--r-- | src/build.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/build.cc b/src/build.cc index fb1cc74..a5f5fe8 100644 --- a/src/build.cc +++ b/src/build.cc @@ -850,9 +850,11 @@ bool Builder::ExtractDeps(CommandRunner::Result* result, deps_nodes->reserve(deps.ins_.size()); for (vector<StringPiece>::iterator i = deps.ins_.begin(); i != deps.ins_.end(); ++i) { - if (!CanonicalizePath(const_cast<char*>(i->str_), &i->len_, err)) + unsigned int slash_bits; + if (!CanonicalizePath(const_cast<char*>(i->str_), &i->len_, err, + &slash_bits)) return false; - deps_nodes->push_back(state_->GetNode(*i)); + deps_nodes->push_back(state_->GetNode(*i, slash_bits)); } if (disk_interface_->RemoveFile(depfile) < 0) { |