From dc8d595461308a79c406cb16e6abb763b589bd3a Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 13 Mar 2015 02:37:49 +0000 Subject: libff: fix enable-shared condition * ext/fiddle/extconf.rb: needs --enable-shared when linked to libruby or fiddle.so. since --with-static-linked-ext does no longer link extensions to ruby program with --enable-shared, the only combination needs --enable-static is --disable-shared and --with-static-linked-ext. [ruby-dev:48901] [Bug #10960] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/fiddle/extconf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index 37bbfdc247..f13e4144b6 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -72,7 +72,7 @@ begin --host=#{libffi.arch} --enable-builddir=#{RUBY_PLATFORM} ] - args << ($enable_shared && !$static ? '--enable-shared' : '--enable-static') + args << ($enable_shared || !$static ? '--enable-shared' : '--enable-static') args << libffi.opt if libffi.opt args.concat %W[ CC=#{cc} CFLAGS=#{libffi.cflags} -- cgit v1.2.3