TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify host_platform normalization

Browse source 
OpenBSD 6 uses `openbsd6` as its sys.platform.  Strip trailing numbers,
then remove the hack for converting `linux2` into `linux`.  This should
prevent compatibility problems when OpenBSD 7 is used.
This commit is contained in:
Kp 2018-03-27 03:49:34 +00:00
parent 4b39cca42e
commit 1097630e42
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -3502,7 +3502,7 @@ class DXXCommon(LazyObjectConstructor):
'variable': EnumVariable,
'arguments': (
('host_endian', None, 'endianness of host platform', {'allowed_values' : ('little', 'big')}),
('host_platform', 'linux' if sys.platform == 'linux2' else sys.platform, 'cross-compile to specified platform', {'allowed_values' : ('darwin', 'linux', 'openbsd6', 'win32')}),
('host_platform', sys.platform.rstrip('0123456789'), 'cross-compile to specified platform', {'allowed_values' : ('darwin', 'linux', 'openbsd', 'win32')}),
('screenshot', 'png', 'screenshot file format', {'allowed_values' : ('legacy', 'png')}),
),
},
@ -3966,7 +3966,7 @@ class DXXCommon(LazyObjectConstructor):
(' with prefix list %s' % str(self._argument_prefix_list)) if self._argument_prefix_list else ''))
# By happy accident, LinuxPlatformSettings produces the desired
# result on OpenBSD, so there is no need for specific handling
# of `platform_name == 'openbsd6'`.
# of `platform_name == 'openbsd'`.
return (
self.Win32PlatformSettings if platform_name == 'win32' else (
self.DarwinPlatformSettings if platform_name == 'darwin' else