diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-11-10 20:00:16 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2014-11-10 20:00:16 (GMT) |
| commit | c47506449cd4f6e44a7d43d9b7ecb33f3b448c16 (patch) | |
| tree | 19868b1bc8634655d27dd73d1c9ad284c2816e04 /src/build.cc | |
| parent | fccce3f6731276f369e4454c59556998cdbb22d4 (diff) | |
| download | Ninja-c47506449cd4f6e44a7d43d9b7ecb33f3b448c16.zip Ninja-c47506449cd4f6e44a7d43d9b7ecb33f3b448c16.tar.gz Ninja-c47506449cd4f6e44a7d43d9b7ecb33f3b448c16.tar.bz2 | |
make all GetNode explicit, add DepsLog canonicalize test
Diffstat (limited to 'src/build.cc')
| -rw-r--r-- | src/build.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/build.cc b/src/build.cc index a346028..3e74131 100644 --- a/src/build.cc +++ b/src/build.cc @@ -825,7 +825,11 @@ bool Builder::ExtractDeps(CommandRunner::Result* result, result->output = parser.Parse(result->output, deps_prefix); for (set<string>::iterator i = parser.includes_.begin(); i != parser.includes_.end(); ++i) { - deps_nodes->push_back(state_->GetNode(*i)); + // ~0 is assuming that with MSVC-parsed headers, it's ok to always make + // all backslashes (as some of the slashes will certainly be backslashes + // anyway). This could be fixed if necessary with some additional + // complexity in IncludesNormalize::Relativize. + deps_nodes->push_back(state_->GetNode(*i, ~0u)); } } else #endif |