nobu	2011-08-10 14:11:10 +0900 (Wed, 10 Aug 2011)

  New Revision: 32902

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

  Log:
    * lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
      option.  [ruby-core:38802] [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 32901)
+++ ChangeLog	(revision 32902)
@@ -1,3 +1,8 @@
+Wed Aug 10 14:11:07 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
+	  option.  [ruby-core:38802] [Bug #5147]
+
 Wed Aug 10 02:53:27 2011  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/http.rb: come back autoload. OpenSSL constant is used
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 32901)
+++ lib/mkmf.rb	(revision 32902)
@@ -2157,7 +2157,7 @@
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup
   $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
-  $LIBRUBYARG = ""
+  $LIBRUBYARG = config['LIBRUBYARG']
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
   $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
@@ -2170,9 +2170,6 @@
   $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 32901)
+++ ruby_1_9_3/ChangeLog	(revision 32902)
@@ -1,3 +1,8 @@
+Wed Aug 10 14:11:07 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
+	  option.  [ruby-core:38802] [Bug #5147]
+
 Wed Aug 10 02:57:01 2011  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/http.rb: come back autoload. OpenSSL constant is used
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 32901)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 32902)
@@ -2157,7 +2157,7 @@
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup
   $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
-  $LIBRUBYARG = ""
+  $LIBRUBYARG = config['LIBRUBYARG']
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
   $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
@@ -2170,9 +2170,6 @@
   $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/