diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -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> * ext/psych/psych.gemspec: installing psych as a gem. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 85666ec004..c6f898e804 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -390,6 +390,7 @@ MSG end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) + librubyarg = $extmk ? $LIBRUBYARG_STATIC : $LIBRUBYARG conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => "#{CONFTEST_C}", 'arch_hdrdir' => $arch_hdrdir.quote, @@ -400,7 +401,7 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) 'ARCH_FLAG' => "#$ARCH_FLAG", 'LDFLAGS' => "#$LDFLAGS #{ldflags}", '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)}) RbConfig::expand(TRY_LINK.dup, conf) end |