From 6bf7dd725bf57dc6d52a7fe3353f70d061193d94 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Aug 2011 05:11:10 +0000
Subject: [PATCH] * lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of
 shared   option.  [ruby-core:38802] [Bug #5147]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 5 +++++
 lib/mkmf.rb | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7cf7f23a62..f844dc75ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 10 14:11:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/net/http.rb: come back autoload. OpenSSL constant is used
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c6f898e804..0a587965db 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2157,7 +2157,7 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG)
   $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 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG)
   $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 = ""