nobu	2014-12-23 22:05:47 +0900 (Tue, 23 Dec 2014)

  New Revision: 48932

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

  Log:
    extmk.rb: replace current directory name
    
    * ext/extmk.rb (extmake): replace "./" at beginning in LOCAL_LIBS
      with the current directory name for values cached in previous
      Makefile.

  Modified files:
    trunk/ext/extmk.rb
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 48931)
+++ ext/fiddle/extconf.rb	(revision 48932)
@@ -123,8 +123,7 @@ types.each do |type, signed| https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L123
 end
 
 if libffi
-  $LIBPATH.unshift libffi.lib
-  $LOCAL_LIBS.prepend("#{libffi.a} ").strip!
+  $LOCAL_LIBS.prepend("./#{libffi.a} ").strip!
 end
 create_makefile 'fiddle' do |conf|
   if !libffi
@@ -155,7 +154,6 @@ end https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L154
 
 if libffi
   $LIBPATH.pop
-  $LOCAL_LIBS.prepend("ext/fiddle/")
 end
 
 # :startdoc:
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 48931)
+++ ext/extmk.rb	(revision 48932)
@@ -293,7 +293,7 @@ def extmake(target) https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L293
       unless $mswin
         $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ")
       end
-      $extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS))
+      $extlibs = merge_libs($extlibs, split_libs($libs, $LOCAL_LIBS).map {|lib| lib.sub(/\A\.\//, "ext/#{target}/")})
       $extpath |= $LIBPATH
     end
   ensure

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