nobu	2011-08-04 02:21:12 +0900 (Thu, 04 Aug 2011)

  New Revision: 32833

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32833

  Log:
    * lib/mkmf.rb (link_command): use static library only for bundled
      extensions.  [Bug #5147]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/mkmf.rb
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32832)
+++ ChangeLog	(revision 32833)
@@ -1,3 +1,8 @@
+Thu Aug  4 02:21:10 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (link_command): use static library only for bundled
+	  extensions.  [Bug #5147]
+
 Thu Aug  4 02:02:10 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/psych.gemspec: installing psych as a gem.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 32832)
+++ lib/mkmf.rb	(revision 32833)
@@ -390,6 +390,7 @@
 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 @@
                                 '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
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32832)
+++ ruby_1_9_3/ChangeLog	(revision 32833)
@@ -1,3 +1,8 @@
+Thu Aug  4 02:21:10 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (link_command): use static library only for bundled
+	  extensions.  [Bug #5147]
+
 Wed Aug  3 00:11:08 2011  Tanaka Akira  <akr@f...>
 
 	* lib/prettyprint.rb: update document.  [ruby-core:36776]
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 32832)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 32833)
@@ -390,6 +390,7 @@
 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 @@
                                 '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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/