From 6a1bb3514f50c917f8030c09b0419763ac280a81 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 10 Aug 2011 05:11:10 +0000 Subject: * lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared option. [ruby-core:38802] [Bug #5147] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c6f898e804..0a587965db 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2157,7 +2157,7 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG) $LIBEXT = config['LIBEXT'].dup $OBJEXT = config["OBJEXT"].dup $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}" - $LIBRUBYARG = "" + $LIBRUBYARG = config['LIBRUBYARG'] $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"] @@ -2170,9 +2170,6 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG) $objs = nil $srcs = nil $libs = "" - if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup) - $LIBRUBYARG = config['LIBRUBYARG'] - end $LOCAL_LIBS = "" -- cgit v1.2.3