summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2014-11-22 02:24:03 (GMT)
committerNico Weber <nicolasweber@gmx.de>2014-11-22 02:24:03 (GMT)
commit76bdba6c3ecdcad67d675b5358dc4f8946def9d6 (patch)
tree9b68c7a5684428393bc57bbda57ac01291cb84bc
parenta70356433e90bd47effd63be867ab53cd99e057d (diff)
parent0bf1bd3f8ecb1bc615ae7b79ef7636a9476c89dc (diff)
downloadNinja-76bdba6c3ecdcad67d675b5358dc4f8946def9d6.zip
Ninja-76bdba6c3ecdcad67d675b5358dc4f8946def9d6.tar.gz
Ninja-76bdba6c3ecdcad67d675b5358dc4f8946def9d6.tar.bz2
Merge pull request #862 from nico/browse
Make browse detection consistent with other platform checks.
-rwxr-xr-xconfigure.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.py b/configure.py
index b38ac86..c58b1e4 100755
--- a/configure.py
+++ b/configure.py
@@ -94,6 +94,9 @@ class Platform(object):
def supports_ppoll(self):
return self._platform in ('linux', 'openbsd', 'bitrig')
+ def supports_ninja_browse(self):
+ return self._platform not in ('windows', 'solaris')
+
class Bootstrap:
"""API shim for ninja_syntax.Writer that instead runs the commands.
@@ -335,9 +338,7 @@ else:
if platform.supports_ppoll() and not options.force_pselect:
cflags.append('-DUSE_PPOLL')
-
-have_browse = not platform.is_windows() and not platform.is_solaris()
-if have_browse:
+if platform.supports_ninja_browse():
cflags.append('-DNINJA_HAVE_BROWSE')
def shell_escape(str):
@@ -399,7 +400,7 @@ n.newline()
objs = []
-if have_browse:
+if platform.supports_ninja_browse():
n.comment('browse_py.h is used to inline browse.py.')
n.rule('inline',
command='src/inline.sh $varname < $in > $out',