Merge branch 'mruby-1.3.0'

2017-07-28 00:51:48 +09:00 · 2017-07-28 00:51:48 +09:00 · 92d686d356
parent 0f69e9c825 217d979458
commit 92d686d356
2 changed files with 2 additions and 2 deletions
--- a/third-party/build_config.rb
+++ b/third-party/build_config.rb
@ -4,7 +4,7 @@ MRuby::Build.new do |conf|

  # C++ project needs this.  Without this, mruby exception does not
  # properly destory C++ object allocated on stack.
-  conf.enable_cxx_abi
+  conf.enable_cxx_exception

  conf.build_dir = ENV['BUILD_DIR']

--- a/third-party/mruby
+++ b/third-party/mruby
@ -1 +1 @@
-Subproject commit 22464fe5a0a10f2b077eaba109ce1e912e4a77de
+Subproject commit 4696093673c3352a1897490ecc5e4e4e40f463b5