admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5102 from dearblue/c++-exc

Browse Source 
Fixed build with `conf.enable_cxx_exception`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-10-29 10:41:56 +09:00
committed by GitHub
parent f24658816c 336f0de8bb
commit 78d185efb9
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mruby_core.rake
+2 -2
View File
@@ -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