diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2014-11-14 01:57:53 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2014-11-14 01:57:53 (GMT) |
| commit | 4daf9c9e831b61326021ff40f047261e0564cb57 (patch) | |
| tree | d8eff3d0885e0da291f5e4fef46c084366640ad9 | |
| parent | 0823ffc09139bf8a83d5bf354f321ceb8ce68693 (diff) | |
| parent | fa62cd4c47e3df4da80342e03741b4dda8181ede (diff) | |
| download | Ninja-4daf9c9e831b61326021ff40f047261e0564cb57.zip Ninja-4daf9c9e831b61326021ff40f047261e0564cb57.tar.gz Ninja-4daf9c9e831b61326021ff40f047261e0564cb57.tar.bz2 | |
Merge pull request #842 from nico/solaris
Fix building on Solaris.
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | platform_helper.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.py b/configure.py index a5e9323..c2abcde 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' |