summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2020-11-21 21:14:40 +0900
committerKOBAYASHI Shuji <[email protected]>2020-11-21 21:14:40 +0900
commit3d056d084aedd2a1a3a36e33b1cef4e90d282813 (patch)
treef463c5ac01e1a32a6dea5b6868e2794f6b0479ef /lib
parent544784effd251656f7b406bc94880e1ef75af7b5 (diff)
downloadmruby-3d056d084aedd2a1a3a36e33b1cef4e90d282813.tar.gz
mruby-3d056d084aedd2a1a3a36e33b1cef4e90d282813.zip
Rename `MRB_{ENABLE,DISABLE}_` to `MRB_{USE,NO}_`; close #5163
| Previous Name | New Name | |------------------------------|-------------------------| | MRB_ENABLE_ALL_SYMBOLS | MRB_USE_ALL_SYMBOLS | | MRB_ENABLE_SYMBOLL_ALL | MRB_USE_ALL_SYMBOLS | | MRB_ENABLE_CXX_ABI | MRB_USE_CXX_ABI | | MRB_ENABLE_CXX_EXCEPTION | MRB_USE_CXX_EXCEPTION | | MRB_ENABLE_DEBUG_HOOK | MRB_USE_DEBUG_HOOK | | MRB_DISABLE_DIRECT_THREADING | MRB_NO_DIRECT_THREADING | | MRB_DISABLE_STDIO | MRB_NO_STDIO | | ENABLE_LINENOISE | MRB_USE_LINENOISE | | ENABLE_READLINE | MRB_USE_READLINE | | DISABLE_MIRB_UNDERSCORE | MRB_NO_MIRB_UNDERSCORE | | DISABLE_GEMS | MRB_NO_GEMS | * `MRB_ENABLE_SYMBOLL_ALL` seems to be a typo, so it is fixed. * `MRB_` prefix is added to those without. * The previous names can also be used for compatibility.
Diffstat (limited to 'lib')
-rw-r--r--lib/mruby/build.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index e553eb437..4af639e3f 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -151,7 +151,7 @@ module MRuby
end
@cxx_exception_enabled = true
compilers.each { |c|
- c.defines += %w(MRB_ENABLE_CXX_EXCEPTION)
+ c.defines += %w(MRB_USE_CXX_EXCEPTION)
c.flags << c.cxx_exception_flag
}
linker.command = cxx.command if toolchains.find { |v| v == 'gcc' }
@@ -171,7 +171,7 @@ module MRuby
raise "cxx_exception already enabled"
end
compilers.each { |c|
- c.defines += %w(MRB_ENABLE_CXX_EXCEPTION MRB_ENABLE_CXX_ABI)
+ c.defines += %w(MRB_USE_CXX_EXCEPTION MRB_USE_CXX_ABI)
c.flags << c.cxx_compile_flag
c.flags = c.flags.flatten - c.cxx_invalid_flags.flatten
}
@@ -188,11 +188,11 @@ module MRuby
#define __STDC_CONSTANT_MACROS
#define __STDC_LIMIT_MACROS
-#ifndef MRB_ENABLE_CXX_ABI
+#ifndef MRB_USE_CXX_ABI
extern "C" {
#endif
#include "#{File.absolute_path src}"
-#ifndef MRB_ENABLE_CXX_ABI
+#ifndef MRB_USE_CXX_ABI
}
#endif
EOS
@@ -273,11 +273,11 @@ EOS
use_mrdb = @gems.find{|g| g.name == "mruby-bin-debugger"}
compilers.each do |compiler|
if respond_to?(:enable_gems?) && enable_gems?
- compiler.defines -= %w(DISABLE_GEMS)
+ compiler.defines -= %w(MRB_NO_GEMS)
else
- compiler.defines += %w(DISABLE_GEMS)
+ compiler.defines += %w(MRB_NO_GEMS)
end
- compiler.defines |= %w(MRB_ENABLE_DEBUG_HOOK) if use_mrdb
+ compiler.defines |= %w(MRB_USE_DEBUG_HOOK) if use_mrdb
compiler.define_rules build_dir, File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
end
end