diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-11-08 00:23:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 00:23:33 (GMT) |
| commit | fdfff1127aa01c686801b0178293d4de52879aa8 (patch) | |
| tree | 907e0562b8f491b0dbcf3a5667b611f24a1df7f8 /src | |
| parent | 21fc1203c1ae8a43812505762407db6842de6bf7 (diff) | |
| parent | 46d9a958fa11b6b5f4f6a106f28898eac54ca842 (diff) | |
| download | Ninja-fdfff1127aa01c686801b0178293d4de52879aa8.zip Ninja-fdfff1127aa01c686801b0178293d4de52879aa8.tar.gz Ninja-fdfff1127aa01c686801b0178293d4de52879aa8.tar.bz2 | |
Merge pull request #1194 from ilor/depfile-empty-path
Improve error message when a depfile contains a bad path
Diffstat (limited to 'src')
| -rw-r--r-- | src/graph.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/graph.cc b/src/graph.cc index f1d9ca2..136ca04 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -422,8 +422,10 @@ bool ImplicitDepLoader::LoadDepFile(Edge* edge, const string& path, unsigned int unused; if (!CanonicalizePath(const_cast<char*>(depfile.out_.str_), - &depfile.out_.len_, &unused, err)) + &depfile.out_.len_, &unused, err)) { + *err = path + ": " + *err; return false; + } // Check that this depfile matches the edge's output, if not return false to // mark the edge as dirty. |