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

ruby-changes:17857

From: nobu <ko1@a...>
Date: Mon, 22 Nov 2010 18:45:52 +0900 (JST)
Subject: [ruby-changes:17857] Ruby:r29870 (trunk): * lib/mkmf.rb (create_makefile): should not duplicate rules.

nobu	2010-11-22 18:45:46 +0900 (Mon, 22 Nov 2010)

  New Revision: 29870

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

  Log:
    * lib/mkmf.rb (create_makefile): should not duplicate rules.
      bug fix of r29842.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29869)
+++ ChangeLog	(revision 29870)
@@ -1,3 +1,8 @@
+Mon Nov 22 18:45:44 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (create_makefile): should not duplicate rules.
+	  bug fix of r29842.
+
 Mon Nov 22 18:04:40 2010  NARUSE, Yui  <naruse@r...>
 
 	* enc/big5.c: split CP950 from Big5.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 29869)
+++ lib/mkmf.rb	(revision 29870)
@@ -9,11 +9,12 @@
 CONFIG = RbConfig::MAKEFILE_CONFIG
 ORIG_LIBPATH = ENV['LIB']
 
+C_EXT = %w[c m]
 CXX_EXT = %w[cc mm cxx cpp]
 if File::FNM_SYSCASE.zero?
   CXX_EXT.concat(%w[C])
 end
-SRC_EXT = %w[c m].concat(CXX_EXT)
+SRC_EXT = C_EXT + CXX_EXT
 $static = nil
 $config_h = '$(arch_hdrdir)/ruby/config.h'
 $default_static = $static
@@ -1973,7 +1974,7 @@
       mfile.printf(compile_command, COMPILE_CXX)
     end
   end
-  SRC_EXT.each do |e|
+  C_EXT.each do |e|
     COMPILE_RULES.each do |rule|
       mfile.printf(rule, e, $OBJEXT)
       mfile.printf(compile_command, COMPILE_C)

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

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