diff options
author | Nico Weber <nicolasweber@gmx.de> | 2014-11-14 01:56:12 (GMT) |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2014-11-14 01:56:12 (GMT) |
commit | 0823ffc09139bf8a83d5bf354f321ceb8ce68693 (patch) | |
tree | 5f3b5a4997e0d0349c271215d13eb5ef85945e79 | |
parent | 1f3f8b452b246144d7516410d7901635260f443e (diff) | |
parent | a39b9577ba25dc4968bbc5f4afe7d17524325bb0 (diff) | |
download | Ninja-0823ffc09139bf8a83d5bf354f321ceb8ce68693.zip Ninja-0823ffc09139bf8a83d5bf354f321ceb8ce68693.tar.gz Ninja-0823ffc09139bf8a83d5bf354f321ceb8ce68693.tar.bz2 |
Merge pull request #852 from nico/browse
Make sure configure.py and ninja.cc always agree on if -t browse is incl...
-rwxr-xr-x | configure.py | 6 | ||||
-rw-r--r-- | src/ninja.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 518c499..a5e9323 100755 --- a/configure.py +++ b/configure.py @@ -175,6 +175,10 @@ if (platform.is_linux() or platform.is_openbsd() or platform.is_bitrig()) and \ not options.force_pselect: cflags.append('-DUSE_PPOLL') +have_browse = not platform.is_windows() and not platform.is_solaris() +if have_browse: + cflags.append('-DNINJA_HAVE_BROWSE') + def shell_escape(str): """Escape str such that it's interpreted as a single argument by the shell.""" @@ -233,7 +237,7 @@ n.newline() objs = [] -if not platform.is_windows() and not platform.is_solaris(): +if have_browse: n.comment('browse_py.h is used to inline browse.py.') n.rule('inline', command='src/inline.sh $varname < $in > $out', diff --git a/src/ninja.cc b/src/ninja.cc index 27380c0..847000a 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -365,7 +365,7 @@ int NinjaMain::ToolQuery(int argc, char* argv[]) { return 0; } -#if !defined(_WIN32) && !defined(NINJA_BOOTSTRAP) +#if defined(NINJA_HAVE_BROWSE) int NinjaMain::ToolBrowse(int argc, char* argv[]) { if (argc < 1) { Error("expected a target to browse"); @@ -698,7 +698,7 @@ int NinjaMain::ToolUrtle(int argc, char** argv) { /// Returns a Tool, or NULL if Ninja should exit. const Tool* ChooseTool(const string& tool_name) { static const Tool kTools[] = { -#if !defined(_WIN32) && !defined(NINJA_BOOTSTRAP) +#if defined(NINJA_HAVE_BROWSE) { "browse", "browse dependency graph in a web browser", Tool::RUN_AFTER_LOAD, &NinjaMain::ToolBrowse }, #endif |