diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-03 17:21:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-03 17:21:12 +0000 |
| commit | ae51324199bf96cbb7439583900bd20bd51186b8 (patch) | |
| tree | cab6b2bdb9c6503c84a4222bc6d4e57b5a0a3b35 /lib | |
| parent | 7150df452269874c234b6191c8c60596c9b09b3a (diff) | |
* lib/mkmf.rb (link_command): use static library only for bundled
extensions. [Bug #5147]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |