summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2014-11-01 19:20:42 (GMT)
committerNico Weber <nicolasweber@gmx.de>2014-11-01 19:20:42 (GMT)
commitfa62cd4c47e3df4da80342e03741b4dda8181ede (patch)
treefae63916db6cabd6f01ac856b00a809517c7c796
parentcc6ce9f7b70de17108380e55b39fa98658e2cdca (diff)
downloadNinja-fa62cd4c47e3df4da80342e03741b4dda8181ede.zip
Ninja-fa62cd4c47e3df4da80342e03741b4dda8181ede.tar.gz
Ninja-fa62cd4c47e3df4da80342e03741b4dda8181ede.tar.bz2
Fix building on Solaris.
"SunOS" and "Solaris" are the same thing these days, so make them go down the same code paths. In particular, the browse feature was omitted on solaris but not sunos5, causing trouble for some folks (see #838).
-rwxr-xr-xconfigure.py2
-rw-r--r--platform_helper.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.py b/configure.py
index 01fd301..70c4be5 100755
--- a/configure.py
+++ b/configure.py
@@ -159,7 +159,7 @@ libs = []
if platform.is_mingw():
cflags.remove('-fvisibility=hidden');
ldflags.append('-static')
-elif platform.is_sunos5():
+elif platform.is_solaris():
cflags.remove('-fvisibility=hidden')
elif platform.is_msvc():
pass
diff --git a/platform_helper.py b/platform_helper.py
index eab8262..035a671 100644
--- a/platform_helper.py
+++ b/platform_helper.py
@@ -35,7 +35,7 @@ class Platform(object):
self._platform = 'freebsd'
elif self._platform.startswith('openbsd'):
self._platform = 'openbsd'
- elif self._platform.startswith('solaris'):
+ elif self._platform.startswith('solaris') or self._platform == 'sunos5':
self._platform = 'solaris'
elif self._platform.startswith('mingw'):
self._platform = 'mingw'
@@ -78,9 +78,6 @@ class Platform(object):
def is_openbsd(self):
return self._platform == 'openbsd'
- def is_sunos5(self):
- return self._platform == 'sunos5'
-
def is_bitrig(self):
return self._platform == 'bitrig'