1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared

Browse Source 
option.  [ruby-core:38802] [Bug #5147]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-08-10 05:11:10 +00:00
parent 72596937af
commit 6bf7dd725b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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:53:27 2011 NARUSE, Yui <naruse@ruby-lang.org> Wed Aug 10 02:53:27 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb: come back autoload. OpenSSL constant is used * lib/net/http.rb: come back autoload. OpenSSL constant is used

5
lib/mkmf.rb
View File

@ -2157,7 +2157,7 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG)
$LIBEXT = config['LIBEXT'].dup $LIBEXT = config['LIBEXT'].dup
$OBJEXT = config["OBJEXT"].dup $OBJEXT = config["OBJEXT"].dup
$LIBS = "#{config['LIBS']} #{config['DLDLIBS']}" $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
$LIBRUBYARG = "" $LIBRUBYARG = config['LIBRUBYARG']
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
$DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"] $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
@ -2170,9 +2170,6 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG)
$objs = nil $objs = nil
$srcs = nil $srcs = nil
$libs = "" $libs = ""
if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
$LIBRUBYARG = config['LIBRUBYARG']
end
$LOCAL_LIBS = "" $LOCAL_LIBS = ""