Project

General

Profile

Bug #4074 ยป mkmf_objc_objcpp-sgonyea.patch

sgonyea (Scott Gonyea), 11/20/2010 07:43 AM

View differences:

lib/mkmf.rb
CONFIG = RbConfig::MAKEFILE_CONFIG
ORIG_LIBPATH = ENV['LIB']
CXX_EXT = %w[cc cxx cpp]
CXX_EXT = %w[cc mm cxx cpp]
if File::FNM_SYSCASE.zero?
CXX_EXT.concat(%w[C])
end
......
mfile.printf(compile_command, COMPILE_CXX)
end
end
%w[c].each do |e|
SRC_EXT.each do |e|
COMPILE_RULES.each do |rule|
mfile.printf(rule, e, $OBJEXT)
mfile.printf(compile_command, COMPILE_C)
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 "$(DLLIB): "
......
RULE_SUBST = config_string('RULE_SUBST')
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_OBJC = config_string('COMPILE_OBJC') || COMPILE_C
TRY_LINK = config_string('TRY_LINK') ||
"$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
"$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
    (1-1/1)