Merge branch 'modify_toolchains_gcc' of https://github.com/crimsonwoods/mruby into crimsonwoods-modify_toolchains_gcc

This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-11-25 09:50:33 +09:00
+11 -1
View File
@@ -1,5 +1,5 @@
MRuby::Toolchain.new(:gcc) do |conf|
[conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
[conf.cc, conf.objc, conf.asm].each do |cc|
cc.command = ENV['CC'] || 'gcc'
cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration)]
cc.include_paths = ["#{MRUBY_ROOT}/include"]
@@ -9,6 +9,16 @@ MRuby::Toolchain.new(:gcc) do |conf|
cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
end
[conf.cxx].each do |cxx|
cxx.command = ENV['CXX'] || 'g++'
cxx.flags = [ENV['CXXFLAGS'] || %w(-g -O3 -Wall -Werror-implicit-function-declaration)]
cxx.include_paths = ["#{MRUBY_ROOT}/include"]
cxx.defines = %w(DISABLE_GEMS)
cxx.option_include_path = '-I%s'
cxx.option_define = '-D%s'
cxx.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
end
conf.linker do |linker|
linker.command = ENV['LD'] || 'gcc'
linker.flags = [ENV['LDFLAGS'] || %w()]