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

* lib/mkmf.rb (link_command): use static library only for bundled

Browse Source 
extensions.  [Bug #5147]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-08-03 17:21:12 +00:00
parent 7150df4522
commit ae51324199
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 4 02:21:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (link_command): use static library only for bundled
extensions. [Bug #5147]
Thu Aug 4 02:02:10 2011 Aaron Patterson <aaron@tenderlovemaking.com> Thu Aug 4 02:02:10 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/psych.gemspec: installing psych as a gem. * ext/psych/psych.gemspec: installing psych as a gem.

3
lib/mkmf.rb
View File

@ -390,6 +390,7 @@ MSG
end end
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
librubyarg = $extmk ? $LIBRUBYARG_STATIC : $LIBRUBYARG
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => "#{CONFTEST_C}", 'src' => "#{CONFTEST_C}",
'arch_hdrdir' => $arch_hdrdir.quote, 'arch_hdrdir' => $arch_hdrdir.quote,
@ -400,7 +401,7 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
'ARCH_FLAG' => "#$ARCH_FLAG", 'ARCH_FLAG' => "#$ARCH_FLAG",
'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS") 'LIBS' => "#{librubyarg} #{opt} #$LIBS")
conf['LIBPATH'] = libpathflag(libpath.map {|s| RbConfig::expand(s.dup, conf)}) conf['LIBPATH'] = libpathflag(libpath.map {|s| RbConfig::expand(s.dup, conf)})
RbConfig::expand(TRY_LINK.dup, conf) RbConfig::expand(TRY_LINK.dup, conf)
end end