diff options
| author | dearblue <[email protected]> | 2020-10-27 22:36:40 +0900 |
|---|---|---|
| committer | dearblue <[email protected]> | 2020-10-28 21:10:33 +0900 |
| commit | 336f0de8bbb87d8bcce17d2f54a9d2234167eef6 (patch) | |
| tree | 393d3e5cb8a1466653144808585111e48af4f513 | |
| parent | 07224f8ed9aeb3b85bb0903adae04e8f3f60df5e (diff) | |
| download | mruby-336f0de8bbb87d8bcce17d2f54a9d2234167eef6.tar.gz mruby-336f0de8bbb87d8bcce17d2f54a9d2234167eef6.zip | |
Fixed build with `conf.enable_cxx_exception`
The problem was manifested by commit 5069fb15e41998dffef8e0ba566b3a82be369ba3.
| -rw-r--r-- | mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-compiler/mrbgem.rake | 2 | ||||
| -rw-r--r-- | src/mruby_core.rake | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index 8fa4fa822..93a4941f4 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -18,7 +18,6 @@ #include <mruby/dump.h> #include <mruby/string.h> #include <mruby/variable.h> -#include <mruby/throw.h> #include <stdlib.h> #include <string.h> diff --git a/mrbgems/mruby-compiler/mrbgem.rake b/mrbgems/mruby-compiler/mrbgem.rake index b25bdaff7..90583e64f 100644 --- a/mrbgems/mruby-compiler/mrbgem.rake +++ b/mrbgems/mruby-compiler/mrbgem.rake @@ -5,7 +5,7 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec| 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).c$/ + next nil if build.cxx_exception_enabled? and f =~ /(codegen|y\.tab)\.c$/ objfile(f.pathmap("#{build_dir}/core/%n")) }.compact diff --git a/src/mruby_core.rake b/src/mruby_core.rake index 73fddb220..0b9e94a20 100644 --- a/src/mruby_core.rake +++ b/src/mruby_core.rake @@ -4,12 +4,12 @@ MRuby.each_target do current_build_dir = "#{build_dir}/#{relative_from_root}" objs = Dir.glob("#{current_dir}/*.c").map { |f| - next nil if cxx_exception_enabled? and f =~ /(error|vm).c$/ + next nil if cxx_exception_enabled? and f =~ /(error|vm|gc)\.c$/ objfile(f.pathmap("#{current_build_dir}/%n")) }.compact if cxx_exception_enabled? - objs += %w(vm error).map { |v| compile_as_cxx "#{current_dir}/#{v}.c", "#{current_build_dir}/#{v}.cxx" } + objs += %w(vm error gc).map { |v| compile_as_cxx "#{current_dir}/#{v}.c", "#{current_build_dir}/#{v}.cxx" } end self.libmruby_objs << objs |