diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Nov 22 18:45:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): should not duplicate rules. + bug fix of r29842. + Mon Nov 22 18:04:40 2010 NARUSE, Yui <naruse@ruby-lang.org> * enc/big5.c: split CP950 from Big5. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 93c1d6b522..7539cf5dba 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -9,11 +9,12 @@ require 'shellwords' 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 @@ site-install-rb: install-rb 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) |