From d9bf31ccefb7dd81653c36e15c6950ca238c1d65 Mon Sep 17 00:00:00 2001
From: sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 24 Oct 2015 12:10:48 +0000
Subject: * lib/mkmf.rb: Revert r45640 because it may lead to link   with
 different libruby. [Bug #9760]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/mkmf.rb')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 1a9b8fb670..d871a9bf82 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -467,7 +467,7 @@ MSG
     end
   end
 
-  def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH)
+  def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
     librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
     conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
                                   'src' => "#{CONFTEST_C}",
@@ -503,7 +503,7 @@ MSG
                      conf)
   end
 
-  def libpathflag(libpath=$LIBPATH|$DEFLIBPATH)
+  def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
     libpath.map{|x|
       case x
       when "$(topdir)", /\A\./
@@ -2179,7 +2179,7 @@ RULES
   #
   def create_makefile(target, srcprefix = nil)
     $target = target
-    libpath = $LIBPATH|$DEFLIBPATH
+    libpath = $DEFLIBPATH|$LIBPATH
     message "creating Makefile\n"
     MakeMakefile.rm_f "#{CONFTEST}*"
     if CONFIG["DLEXT"] == $OBJEXT
@@ -2260,7 +2260,7 @@ RULES
     conf = yield(conf) if block_given?
     mfile.puts(conf)
     mfile.print "
-libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")}
+libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
 LIBPATH = #{libpath}
 DEFFILE = #{deffile}
 
-- 
cgit v1.2.3