diff options
author | Scott Graham <scottmg@chromium.org> | 2015-06-09 00:17:55 (GMT) |
---|---|---|
committer | Scott Graham <scottmg@chromium.org> | 2015-06-09 00:17:55 (GMT) |
commit | 1493c6a0b0f779294b870ae8ee4a8515087ac64e (patch) | |
tree | f46ba40a191693e81d0ee3c55ce0eea2b127553d /src/msvc_helper-win32.cc | |
parent | a2d1cf2f26bdd7a326a3ef6186ee507fd87868d0 (diff) | |
download | Ninja-1493c6a0b0f779294b870ae8ee4a8515087ac64e.zip Ninja-1493c6a0b0f779294b870ae8ee4a8515087ac64e.tar.gz Ninja-1493c6a0b0f779294b870ae8ee4a8515087ac64e.tar.bz2 |
push error to caller and abort on failure
Diffstat (limited to 'src/msvc_helper-win32.cc')
-rw-r--r-- | src/msvc_helper-win32.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/msvc_helper-win32.cc b/src/msvc_helper-win32.cc index e465279..4b22c7a 100644 --- a/src/msvc_helper-win32.cc +++ b/src/msvc_helper-win32.cc @@ -95,9 +95,15 @@ string CLParser::Parse(const string& output, const string& deps_prefix) { string include = FilterShowIncludes(line, deps_prefix); if (!include.empty()) { - include = IncludesNormalize::Normalize(include, NULL); - if (!IsSystemInclude(include)) - includes_.insert(include); + string normalized; + string err; + if (!IncludesNormalize::Normalize(include, NULL, &normalized, &err)) { + printf("failed to normalize path: %s: %s\n", include.c_str(), + err.c_str()); + abort(); + } + if (!IsSystemInclude(normalized)) + includes_.insert(normalized); } else if (FilterInputFilename(line)) { // Drop it. // TODO: if we support compiling multiple output files in a single |