diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-10 05:11:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-10 05:11:10 +0000 |
| commit | 6bf7dd725bf57dc6d52a7fe3353f70d061193d94 (patch) | |
| tree | 89bc70e188c238d727d6c90fce7f7f6abb36eb9c /lib | |
| parent | 72596937af869b2a3e3f8db0a46971fe208044de (diff) | |
* 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/trunk@32902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 1 insertions, 4 deletions
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 = "" |