[前][次][番号順一覧][スレッド一覧]

ruby-changes:11953

From: usa <ko1@a...>
Date: Mon, 1 Jun 2009 20:48:07 +0900 (JST)
Subject: [ruby-changes:11953] Ruby:r23617 (ruby_1_8): * lib/mkmf.rb (create_makefile): should set srcs in all paths.

usa	2009-06-01 20:47:52 +0900 (Mon, 01 Jun 2009)

  New Revision: 23617

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

  Log:
    * lib/mkmf.rb (create_makefile): should set srcs in all paths.
    * lib/mkmf.rb (create_makefile): $objs somtimes includes files with
      $OBJEXT instead of ".o".

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23616)
+++ ruby_1_8/ChangeLog	(revision 23617)
@@ -1,3 +1,10 @@
+Mon Jun  1 20:45:48 2009  NAKAMURA Usaku  <usa@r...>
+
+	* lib/mkmf.rb (create_makefile): should set srcs in all paths.
+
+	* lib/mkmf.rb (create_makefile): $objs somtimes includes files with
+	  $OBJEXT instead of ".o".
+
 Mon Jun  1 09:02:48 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 23616)
+++ ruby_1_8/lib/mkmf.rb	(revision 23617)
@@ -1467,8 +1467,8 @@
       raise "source files duplication - #{objs.sort.map {|b, f| f.inspect}.join(", ")}"
     end
   else
-    $objs.collect! {|o| o.chomp(".o") << ext} unless $OBJEXT == "o"
-    $srcs ||= $objs.collect {|o| o.chomp(ext) << ".c"}
+    $objs.collect! {|o| o.sub(/\.o\z/, ext)} unless $OBJEXT == "o"
+    srcs = $srcs ||= $objs.collect {|o| o.chomp(ext) << ".c"}
   end
 
   target = nil if $objs.empty?

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

[前][次][番号順一覧][スレッド一覧]