1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (create_makefile): should not duplicate rules.

Browse Source 
bug fix of r29842.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-22 09:45:46 +00:00
parent 60dfa6b655
commit 42e17a0b3f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Mon Nov 22 18:04:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
* enc/big5.c: split CP950 from Big5. * enc/big5.c: split CP950 from Big5.

5
lib/mkmf.rb
View File

@ -9,11 +9,12 @@ require 'shellwords'
CONFIG = RbConfig::MAKEFILE_CONFIG CONFIG = RbConfig::MAKEFILE_CONFIG
ORIG_LIBPATH = ENV['LIB'] ORIG_LIBPATH = ENV['LIB']
C_EXT = %w[c m]
CXX_EXT = %w[cc mm cxx cpp] CXX_EXT = %w[cc mm cxx cpp]
if File::FNM_SYSCASE.zero? if File::FNM_SYSCASE.zero?
CXX_EXT.concat(%w[C]) CXX_EXT.concat(%w[C])
end end
SRC_EXT = %w[c m].concat(CXX_EXT) SRC_EXT = C_EXT + CXX_EXT
$static = nil $static = nil
$config_h = '$(arch_hdrdir)/ruby/config.h' $config_h = '$(arch_hdrdir)/ruby/config.h'
$default_static = $static $default_static = $static
@ -1973,7 +1974,7 @@ site-install-rb: install-rb
mfile.printf(compile_command, COMPILE_CXX) mfile.printf(compile_command, COMPILE_CXX)
end end
end end
SRC_EXT.each do |e| C_EXT.each do |e|
COMPILE_RULES.each do |rule| COMPILE_RULES.each do |rule|
mfile.printf(rule, e, $OBJEXT) mfile.printf(rule, e, $OBJEXT)
mfile.printf(compile_command, COMPILE_C) mfile.printf(compile_command, COMPILE_C)