diff options
Diffstat (limited to 'ext/fiddle')
-rw-r--r-- | ext/fiddle/extconf.rb | 5 | ||||
-rwxr-xr-x | ext/fiddle/win32/libffi.mk.tmpl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index 2bc5b8560d..5688086f44 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -36,7 +36,7 @@ begin end libffi.include = "#{libffi.builddir}/include" libffi.lib = "#{libffi.builddir}/.libs" - libffi.a = "#{libffi.lib}/libffi.#{$LIBEXT}" + libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}" nowarn = CONFIG.merge("warnflags"=>"") libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn) ver = ver[/libffi-(.*)/, 1] @@ -64,9 +64,10 @@ begin ld = RbConfig::CONFIG['LD'] args.concat %W[ --srcdir=#{libffi.srcdir} - --disable-shared --host=#{libffi.arch} + --host=#{libffi.arch} --enable-builddir=#{RUBY_PLATFORM} ] + args << ($enable_shared || !$static ? '--enable-shared' : '--enable-static') args << libffi.opt if libffi.opt args.concat %W[ CC=#{cc} CFLAGS=#{libffi.cflags} diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl index 28d0a67897..2a16e8efec 100755 --- a/ext/fiddle/win32/libffi.mk.tmpl +++ b/ext/fiddle/win32/libffi.mk.tmpl @@ -30,7 +30,7 @@ SRCDIR = $(TOPDIR)/src WORKDIR = ./.libs BUILDDIR= ./src LIBNAME = lib$(NAME) -STATICLIB= $(WORKDIR)/$(LIBNAME).$(LIBEXT) +STATICLIB= $(WORKDIR)/$(LIBNAME)_convenience.$(LIBEXT) HEADERS = \ ./fficonfig.h |