mirror of https://gitlab.com/ita1024/waf.git
merged the os2 case in Utils.is_win32
This commit is contained in:
parent
6eec35c1de
commit
32d2f0e1da
|
@ -310,8 +310,7 @@ def check_python_headers(conf):
|
|||
|
||||
# under certain conditions, python extensions must link to
|
||||
# python libraries, not just python embedding programs.
|
||||
if (Utils.is_win32 or sys.platform.startswith('os2')
|
||||
or dct['Py_ENABLE_SHARED']):
|
||||
if Utils.is_win32 or dct['Py_ENABLE_SHARED']:
|
||||
env['LIBPATH_PYEXT'] = env['LIBPATH_PYEMBED']
|
||||
env['LIB_PYEXT'] = env['LIB_PYEMBED']
|
||||
|
||||
|
|
|
@ -137,7 +137,7 @@ except ImportError:
|
|||
def keys(self):
|
||||
return self.lst
|
||||
|
||||
is_win32 = sys.platform in ('win32', 'cli')
|
||||
is_win32 = sys.platform in ('win32', 'cli', 'os2')
|
||||
|
||||
def readf(fname, m='r', encoding='ISO8859-1'):
|
||||
"""
|
||||
|
@ -611,7 +611,8 @@ def unversioned_sys_platform():
|
|||
# powerpc == darwin for our purposes
|
||||
if s == 'powerpc':
|
||||
return 'darwin'
|
||||
if s == 'win32' or s.endswith('os2') and s != 'sunos2': return s
|
||||
if s == 'win32' or s == 'os2':
|
||||
return s
|
||||
return re.split('\d+$', s)[0]
|
||||
|
||||
def nada(*k, **kw):
|
||||
|
|
Loading…
Reference in New Issue