Merge pull request #642 from iij/pr-fix-build-make-flags

add AR, YACC flags.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2012-12-18 16:00:20 -08:00
+6 -2
View File
@@ -38,9 +38,9 @@ LIBS = [ENV['LIBS'] || '-lm']
CFLAGS << "-Wall" << "-Werror-implicit-function-declaration" << "-I#{MRUBY_ROOT}/include"
if ENV['OS'] == 'Windows_NT'
MAKE_FLAGS = "--no-print-directory CC=#{CC} LL=#{LL} CFLAGS=\"#{CFLAGS.join(' ')}\" LDFLAGS=\"#{LDFLAGS.join(' ')}\" LIBS=\"#{LIBS.join(' ')}\" ENABLE_GEMS=\"#{ENABLE_GEMS}\" MRUBY_ROOT=\"#{MRUBY_ROOT}\""
MAKE_FLAGS = "--no-print-directory CC=#{CC} LL=#{LL} AR=#{AR} YACC=#{YACC} CFLAGS=\"#{CFLAGS.join(' ')}\" LDFLAGS=\"#{LDFLAGS.join(' ')}\" LIBS=\"#{LIBS.join(' ')}\" ENABLE_GEMS=\"#{ENABLE_GEMS}\" MRUBY_ROOT=\"#{MRUBY_ROOT}\""
else
MAKE_FLAGS = "--no-print-directory CC='#{CC}' LL='#{LL}' CFLAGS='#{CFLAGS.join(' ')}' LDFLAGS='#{LDFLAGS.join(' ')}' LIBS='#{LIBS.join(' ')}' ENABLE_GEMS='#{ENABLE_GEMS}' MRUBY_ROOT='#{MRUBY_ROOT}'"
MAKE_FLAGS = "--no-print-directory CC='#{CC}' LL='#{LL}' AR='#{AR}' YACC='#{YACC}' CFLAGS='#{CFLAGS.join(' ')}' LDFLAGS='#{LDFLAGS.join(' ')}' LIBS='#{LIBS.join(' ')}' ENABLE_GEMS='#{ENABLE_GEMS}' MRUBY_ROOT='#{MRUBY_ROOT}'"
end
@@ -95,9 +95,13 @@ desc "show build config summary"
task :showconfig do
puts " CC = #{CC}"
puts " LL = #{LL}"
puts " AR = #{AR}"
puts " YACC = #{YACC}"
puts " MAKE = #{MAKE}"
puts ""
puts " CFLAGS = #{CFLAGS.join(' ')}"
puts " LDFLAGS = #{LDFLAGS.join(' ')}"
puts " LIBS = #{LIBS.join(' ')}"
puts ""
puts " ENABLE_GEMS = #{ENABLE_GEMS}"
end