kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.

Browse source 
Thanks Scott Gonyea! [ruby-core:33260]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2010-11-19 22:47:20 +00:00
parent 460d4c4925
commit c62c8f725d
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Nov 20 07:45:50 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.
Thanks Scott Gonyea! [ruby-core:33260]
Sat Nov 20 01:57:55 2010 Akio Tajima <artonx@yahoo.co.jp> Sat Nov 20 01:57:55 2010 Akio Tajima <artonx@yahoo.co.jp>
* common.mk: add dependency(insns.inc) to compile.obj * common.mk: add dependency(insns.inc) to compile.obj

11
lib/mkmf.rb
View file

@ -9,7 +9,7 @@ require 'shellwords'
CONFIG = RbConfig::MAKEFILE_CONFIG CONFIG = RbConfig::MAKEFILE_CONFIG
ORIG_LIBPATH = ENV['LIB'] ORIG_LIBPATH = ENV['LIB']
CXX_EXT = %w[cc 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
@ -1973,18 +1973,12 @@ site-install-rb: install-rb
mfile.printf(compile_command, COMPILE_CXX) mfile.printf(compile_command, COMPILE_CXX)
end end
end end
%w[c].each do |e| SRC_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)
end end
end end
%w[m].each do |e|
COMPILE_RULES.each do |rule|
mfile.printf(rule, e, $OBJEXT)
mfile.printf(compile_command, COMPILE_OBJC)
end
end
mfile.print "$(RUBYARCHDIR)/" if $extout mfile.print "$(RUBYARCHDIR)/" if $extout
mfile.print "$(DLLIB): " mfile.print "$(DLLIB): "
@ -2151,7 +2145,6 @@ COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
RULE_SUBST = config_string('RULE_SUBST') RULE_SUBST = config_string('RULE_SUBST')
COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<' COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<' COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
COMPILE_OBJC = config_string('COMPILE_OBJC') || COMPILE_C
TRY_LINK = config_string('TRY_LINK') || TRY_LINK = config_string('TRY_LINK') ||
"$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \ "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
"$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)" "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"