From fa62cd4c47e3df4da80342e03741b4dda8181ede Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Sat, 1 Nov 2014 12:20:42 -0700 Subject: 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). --- configure.py | 2 +- platform_helper.py | 5 +---- 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' -- cgit v0.12