nobu	2011-08-11 15:07:37 +0900 (Thu, 11 Aug 2011)

  New Revision: 32927

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

  Log:
    * lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
      unbundled extensions.  [ruby-core:38802] [Bug #5147]
    * lib/mkmf.rb (init_mkmf): revert r32902.  [ruby-core:38903]

  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 32926)
+++ ChangeLog	(revision 32927)
@@ -1,3 +1,10 @@
+Thu Aug 11 15:07:36 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
+	  unbundled extensions.  [ruby-core:38802] [Bug #5147]
+
+	* lib/mkmf.rb (init_mkmf): revert r32902.  [ruby-core:38903]
+
 Wed Aug 10 23:03:55 2011  Tanaka Akira  <akr@f...>
 
 	* ext/socket/lib/socket.rb: fix argument check in the previous commit.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 32926)
+++ lib/mkmf.rb	(revision 32927)
@@ -390,7 +390,7 @@
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
-  librubyarg = $extmk ? $LIBRUBYARG_STATIC : $LIBRUBYARG
+  librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
   conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
                                 'src' => "#{CONFTEST_C}",
                                 'arch_hdrdir' => $arch_hdrdir.quote,
@@ -2157,7 +2157,7 @@
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup
   $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
-  $LIBRUBYARG = config['LIBRUBYARG']
+  $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
   $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
@@ -2170,6 +2170,9 @@
   $objs = nil
   $srcs = nil
   $libs = ""
+  if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
+    $LIBRUBYARG = config['LIBRUBYARG']
+  end
 
   $LOCAL_LIBS = ""
 
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32926)
+++ ruby_1_9_3/ChangeLog	(revision 32927)
@@ -1,3 +1,10 @@
+Thu Aug 11 15:07:36 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
+	  unbundled extensions.  [ruby-core:38802] [Bug #5147]
+
+	* lib/mkmf.rb (init_mkmf): revert r32902.  [ruby-core:38903]
+
 Wed Aug 10 19:30:00 2011  Kenta Murata  <mrkn@m...>
 
 	* backport r32903 from trunk.
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 32926)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 32927)
@@ -390,7 +390,7 @@
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
-  librubyarg = $extmk ? $LIBRUBYARG_STATIC : $LIBRUBYARG
+  librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
   conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
                                 'src' => "#{CONFTEST_C}",
                                 'arch_hdrdir' => $arch_hdrdir.quote,
@@ -2157,7 +2157,7 @@
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup
   $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
-  $LIBRUBYARG = config['LIBRUBYARG']
+  $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
   $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
@@ -2170,6 +2170,9 @@
   $objs = nil
   $srcs = nil
   $libs = ""
+  if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
+    $LIBRUBYARG = config['LIBRUBYARG']
+  end
 
   $LOCAL_LIBS = ""
 

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