diff options
-rw-r--r-- | Misc/NEWS | 2 | ||||
-rw-r--r-- | setup.py | 16 |
2 files changed, 11 insertions, 7 deletions
@@ -93,6 +93,8 @@ Windows Build ----- +- Issue #26661: setup.py now detects system libffi with multiarch wrapper. + - Issue #15819: Remove redundant include search directory option for building outside the source tree. @@ -2025,14 +2025,16 @@ class PyBuildExt(build_ext): ffi_inc = find_file('ffi.h', [], inc_dirs) if ffi_inc is not None: ffi_h = ffi_inc[0] + '/ffi.h' - with open(ffi_h) as fp: - while 1: - line = fp.readline() - if not line: - ffi_inc = None - break - if line.startswith('#define LIBFFI_H'): + with open(ffi_h) as f: + for line in f: + line = line.strip() + if line.startswith(('#define LIBFFI_H', + '#define ffi_wrapper_h')): break + else: + ffi_inc = None + print('Header file {} does not define LIBFFI_H or ' + 'ffi_wrapper_h'.format(ffi_h)) ffi_lib = None if ffi_inc is not None: for lib_name in ('ffi', 'ffi_pic'): |