summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-11-14 01:53:26 (GMT)
committerNico Weber <thakis@chromium.org>2014-11-14 01:54:05 (GMT)
commita39b9577ba25dc4968bbc5f4afe7d17524325bb0 (patch)
tree5f3b5a4997e0d0349c271215d13eb5ef85945e79 /configure.py
parent1f3f8b452b246144d7516410d7901635260f443e (diff)
downloadNinja-a39b9577ba25dc4968bbc5f4afe7d17524325bb0.zip
Ninja-a39b9577ba25dc4968bbc5f4afe7d17524325bb0.tar.gz
Ninja-a39b9577ba25dc4968bbc5f4afe7d17524325bb0.tar.bz2
Make sure configure.py and ninja.cc always agree on if -t browse is included.
No behavior change on most platforms. On solaris, -t browse was compiled in in ninja.cc but browse.cc wasn't compiled in, which probably means that building on Solaris didn't work. It might be better now. This also makes browse.cc automatically not included in bootstrap builds; previously this was done manually through the NINJA_BOOTSTRAP check.
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py6
1 files changed, 5 insertions, 1 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',