summaryrefslogtreecommitdiff
path: root/ext/fiddle
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-13 02:37:49 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-13 02:37:49 (GMT)
commitdc8d595461308a79c406cb16e6abb763b589bd3a (patch)
tree8c2d1f83d6805cf19cb6adf866cfaeca98e839f8 /ext/fiddle
parentf0e2c9591bd37f9a6a42289894c18c30a13efc54 (diff)
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
Diffstat (limited to 'ext/fiddle')
-rw-r--r--ext/fiddle/extconf.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 37bbfdc..f13e414 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}