summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortake_cheeze <[email protected]>2014-04-08 20:16:18 +0900
committertake_cheeze <[email protected]>2014-04-08 20:16:18 +0900
commit758cdd5b333adc536d6acefc2b663226536f597c (patch)
tree7d9957a47dc1330b66a4c2ce97bbfaeea010c2c4
parentb26ca1b55b691d7b93738e6cb3e14a2a00c85080 (diff)
downloadmruby-758cdd5b333adc536d6acefc2b663226536f597c.tar.gz
mruby-758cdd5b333adc536d6acefc2b663226536f597c.zip
Add MRuby::Build#disable_cxx_exception to force C++ ABI disable.
-rw-r--r--tasks/mruby_build.rake7
1 files changed, 6 insertions, 1 deletions
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index 5877c11cd..1de00d496 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -82,6 +82,7 @@ module MRuby
@gems, @libmruby = MRuby::Gem::List.new, []
@build_mrbtest_lib_only = false
@cxx_abi_enabled = false
+ @cxx_exception_disabled = false
MRuby.targets[@name] = self
end
@@ -95,12 +96,16 @@ module MRuby
@mrbc.compile_options += ' -g'
end
+ def disable_cxx_exception
+ @cxx_exception_disabled = true
+ end
+
def cxx_abi_enabled?
@cxx_abi_enabled
end
def enable_cxx_abi
- return if @cxx_abi_enabled
+ return if @cxx_exception_disabled or @cxx_abi_enabled
compilers.each { |c| c.defines += %w(MRB_ENABLE_CXX_EXCEPTION) }
linker.command = cxx.command
@cxx_abi_enabled = true