diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/fiddle/extconf.rb | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Jun 16 01:38:40 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded. + On Debian/lenny, which is a "supported" platform, ffi.h is installed + in /usr/include/i486-linux-gnu/. This causes build error when using + gcc whose target is not i486-linux-gnu. + Wed Jun 16 00:04:38 2010 Yusuke Endoh <mame@tsg.ne.jp> * test/ruby/test_io.rb (safe_4): does not use Timeout because diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index c80a1f9a83..dcc2c43cfd 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -4,7 +4,8 @@ require 'mkmf' dir_config 'libffi' -unless pkg_config("libffi") or have_header('ffi.h') +pkg_config("libffi") +unless have_header('ffi.h') if have_header('ffi/ffi.h') $defs.push(format('-DUSE_HEADER_HACKS')) else |