Skip to content

Commit

Permalink
bpo-30912: Don't check the content of ffi.h (GH-2687)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
shlomif authored and zware committed Sep 6, 2017
1 parent c5bace2 commit 6d51b87
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2021,16 +2021,9 @@ def detect_ctypes(self, inc_dirs, lib_dirs):
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'):
Expand Down

0 comments on commit 6d51b87

Please sign in to comment.