diff options
Diffstat (limited to 'mrbgems/mruby-compiler')
| -rw-r--r-- | mrbgems/mruby-compiler/mrbgem.rake | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/mrbgems/mruby-compiler/mrbgem.rake b/mrbgems/mruby-compiler/mrbgem.rake index 9df846abb..70f9e19d8 100644 --- a/mrbgems/mruby-compiler/mrbgem.rake +++ b/mrbgems/mruby-compiler/mrbgem.rake @@ -3,20 +3,18 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec| spec.author = 'mruby developers' spec.summary = 'mruby compiler library' - lex_def = "#{dir}/core/lex.def" - core_objs = Dir.glob("#{dir}/core/*.c").map { |f| - next nil if build.cxx_exception_enabled? and f =~ /(codegen|y\.tab)\.c$/ - objfile(f.pathmap("#{build_dir}/core/%n")) - }.compact - - if build.cxx_exception_enabled? - core_objs << - build.compile_as_cxx("#{dir}/core/y.tab.c", "#{build_dir}/core/y.tab.cxx", - objfile("#{build_dir}/y.tab"), ["#{dir}/core"]) << - build.compile_as_cxx("#{dir}/core/codegen.c", "#{build_dir}/core/codegen.cxx") - else - core_objs << objfile("#{build_dir}/core/y.tab") + as_cxx_srcs = %w[codegen y.tab].map{|name| "#{dir}/core/#{name}.c"} + objs = Dir.glob("#{dir}/core/*.c").map do |src| + dst = src.pathmap("#{build_dir}/core/%n") + if build.cxx_exception_enabled? && as_cxx_srcs.include?(src) + build.compile_as_cxx(src, "#{dst}.cxx") + else + objfile(dst) + end end + build.libmruby_core_objs << objs + + lex_def = "#{dir}/core/lex.def" # Parser file "#{dir}/core/y.tab.c" => ["#{dir}/core/parse.y", lex_def] do |t| @@ -30,9 +28,6 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec| replace_line_directive(t.name) end - file build.libmruby_core_static => core_objs - build.libmruby << core_objs - def replace_line_directive(path) content = File.read(path).gsub(%r{ ^\#line\s+\d+\s+"\K.*$ | # #line directive |