nobu	2014-04-20 08:41:36 +0900 (Sun, 20 Apr 2014)

  New Revision: 45640

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

  Log:
    mkmf.rb: prefer $LIBPATH than $DEFLIBPATH
    
    * lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
      user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
      [ruby-trunk - Bug #9760]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 45639)
+++ ChangeLog	(revision 45640)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Apr 20 08:41:33 2014  Andrew DeMaria  <ademariad@g...>
+
+	* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
+	  user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
+	  [ruby-trunk - Bug #9760]
+
 Sun Apr 20 06:01:18 2014  Eric Wong  <e@8...>
 
 	* gc.c (rb_gc_writebarrier): drop special case for big hash/array
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 45639)
+++ lib/mkmf.rb	(revision 45640)
@@ -467,7 +467,7 @@ MSG https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L467
     end
   end
 
-  def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
+  def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH)
     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=$DEFLIBPATH|$LIBPATH)
+  def libpathflag(libpath=$LIBPATH|$DEFLIBPATH)
     libpath.map{|x|
       case x
       when "$(topdir)", /\A\./
@@ -2125,7 +2125,7 @@ RULES https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2125
   #
   def create_makefile(target, srcprefix = nil)
     $target = target
-    libpath = $DEFLIBPATH|$LIBPATH
+    libpath = $LIBPATH|$DEFLIBPATH
     message "creating Makefile\n"
     MakeMakefile.rm_f "#{CONFTEST}*"
     if CONFIG["DLEXT"] == $OBJEXT
@@ -2206,7 +2206,7 @@ RULES https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2206
     conf = yield(conf) if block_given?
     mfile.puts(conf)
     mfile.print "
-libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
+libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")}
 LIBPATH = #{libpath}
 DEFFILE = #{deffile}
 

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