summaryrefslogtreecommitdiffstats
path: root/src/build.cc
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2015-06-12 06:53:32 (GMT)
committerNico Weber <thakis@chromium.org>2016-04-06 01:08:32 (GMT)
commit3a889126247d31d637c7470554be12f7c1df2ffa (patch)
tree9b66b601fc2b0296f3d1ac95aee6a20c176c0568 /src/build.cc
parentaea5a4d41ff626f46a06a245f54f1175712470f8 (diff)
downloadNinja-3a889126247d31d637c7470554be12f7c1df2ffa.zip
Ninja-3a889126247d31d637c7470554be12f7c1df2ffa.tar.gz
Ninja-3a889126247d31d637c7470554be12f7c1df2ffa.tar.bz2
Make deps=msvc experimentally available on non-Windows.
This makes it possible to run most of the clparser tests on non-Windows, and is potentially useful for cross-compiling on non-Windows hosts. Also, the manual didn't document this as Windows-only previously. If you use this on non-Windows, please let me know, else I might undo this change again in the future.
Diffstat (limited to 'src/build.cc')
-rw-r--r--src/build.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/build.cc b/src/build.cc
index e33a007..2df5c1a 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -25,12 +25,12 @@
#endif
#include "build_log.h"
+#include "clparser.h"
#include "debug_flags.h"
#include "depfile_parser.h"
#include "deps_log.h"
#include "disk_interface.h"
#include "graph.h"
-#include "msvc_helper.h"
#include "state.h"
#include "subprocess.h"
#include "util.h"
@@ -854,7 +854,6 @@ bool Builder::ExtractDeps(CommandRunner::Result* result,
const string& deps_prefix,
vector<Node*>* deps_nodes,
string* err) {
-#ifdef _WIN32
if (deps_type == "msvc") {
CLParser parser;
string output;
@@ -870,7 +869,6 @@ bool Builder::ExtractDeps(CommandRunner::Result* result,
deps_nodes->push_back(state_->GetNode(*i, ~0u));
}
} else
-#endif
if (deps_type == "gcc") {
string depfile = result->edge->GetUnescapedDepfile();
if (depfile.empty()) {