diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Aug 10 14:11:07 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared + option. [ruby-core:38802] [Bug #5147] + Wed Aug 10 02:57:01 2011 NARUSE, Yui <naruse@ruby-lang.org> * lib/net/http.rb: come back autoload. OpenSSL constant is used 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 = "" |