diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-10-29 10:41:56 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-29 10:41:56 +0900 |
| commit | 78d185efb9ee62ae38b3f97c53372ae3a44fef51 (patch) | |
| tree | 2d5523f82db2ad3b3051bbcf036f892501030007 | |
| parent | f24658816c60147ddcc6c4123706d45eef0a00ed (diff) | |
| parent | 336f0de8bbb87d8bcce17d2f54a9d2234167eef6 (diff) | |
| download | mruby-78d185efb9ee62ae38b3f97c53372ae3a44fef51.tar.gz mruby-78d185efb9ee62ae38b3f97c53372ae3a44fef51.zip | |
Merge pull request #5102 from dearblue/c++-exc
Fixed build with `conf.enable_cxx_exception`
| -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 |