diff options
author | Shlomi Fish <shlomif@shlomifish.org> | 2017-09-06 23:19:19 +0300 |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2017-09-06 13:19:19 -0700 |
commit | 6d51b876121e472d4372496d609a26d7e3081c51 (patch) | |
tree | fa8c4a3a2e714ab1fbc9dd889b1ebae4abd9f4cb | |
parent | bpo-29505: Add fuzz tests for float(str), int(str), unicode(str) (#2878) (diff) | |
download | cpython-6d51b876121e472d4372496d609a26d7e3081c51.tar.gz cpython-6d51b876121e472d4372496d609a26d7e3081c51.tar.bz2 cpython-6d51b876121e472d4372496d609a26d7e3081c51.zip |
bpo-30912: Don't check the content of ffi.h (GH-2687)
Various platforms have various methods of handling multiarch libffi which probably won't match the previously looked-for defines. Now we just make sure that ffi.h is available.
-rw-r--r-- | setup.py | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -2021,16 +2021,9 @@ 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 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)) + if not os.path.exists(ffi_h): + ffi_inc = None + print('Header file {} does not exist'.format(ffi_h)) ffi_lib = None if ffi_inc is not None: for lib_name in ('ffi', 'ffi_pic'): |