sorah	2015-10-24 21:10:48 +0900 (Sat, 24 Oct 2015)

  New Revision: 52267

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

  Log:
    * lib/mkmf.rb: Revert r45640 because it may lead to link
      with different libruby. [Bug #9760]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52266)
+++ ChangeLog	(revision 52267)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct 24 21:06:43 2015  Shota Fukumori (sora_h)  <her@s...>
+
+	* lib/mkmf.rb: Revert r45640 because it may lead to link
+	  with different libruby. [Bug #9760] 
+
 Sat Oct 24 15:42:20 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* bootstraptest/test_method.rb: relax error message format.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 52266)
+++ lib/mkmf.rb	(revision 52267)
@@ -467,7 +467,7 @@ MSG https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L467
     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 https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L503
                      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 https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2179
   #
   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 https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2260
     conf = yield(conf) if block_given?
     mfile.puts(conf)
     mfile.print "
-libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")}
+libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
 LIBPATH = #{libpath}
 DEFFILE = #{deffile}
 

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