[pypy-svn] r47373 - pypy/dist/pypy/rlib

[fijal at codespeak.net]

Author: fijal
Date: Wed Oct 10 10:46:19 2007
New Revision: 47373

Modified:
   pypy/dist/pypy/rlib/libffi.py
Log:
Another try


Modified: pypy/dist/pypy/rlib/libffi.py
==============================================================================
--- pypy/dist/pypy/rlib/libffi.py	(original)
+++ pypy/dist/pypy/rlib/libffi.py	Wed Oct 10 10:46:19 2007
@@ -8,6 +8,7 @@
 from pypy.rlib.rarithmetic import intmask
 
 includes = ['dlfcn.h', 'ffi.h']
+include_dirs = ['/usr/include/libffi']
 
 FFI_TYPE_P = lltype.Ptr(lltype.ForwardReference())
 FFI_TYPE_PP = rffi.CArrayPtr(FFI_TYPE_P)
@@ -15,6 +16,7 @@
 class CConfig:
     _includes_ = includes
     _libraries_ = ['ffi']
+    _include_dirs_ = include_dirs
 
     RTLD_LOCAL = rffi_platform.DefinedConstantInteger('RTLD_LOCAL')
     RTLD_NOW = rffi_platform.DefinedConstantInteger('RTLD_NOW')
@@ -54,11 +56,7 @@
 class cConfig:
     pass
 
-try:
-    cConfig.__dict__.update(rffi_platform.configure(CConfig))
-except:
-    includes[1] = 'ffi/ffi.h'
-    cConfig.__dict__.update(rffi_platform.configure(CConfig))
+cConfig.__dict__.update(rffi_platform.configure(CConfig))
 
 FFI_TYPE_P.TO.become(cConfig.ffi_type)
 size_t = cConfig.size_t