diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-03-22 12:43:58 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-22 12:43:58 +0900 |
| commit | 30576bf3c6224db2feaae95f91cb41d22d7df733 (patch) | |
| tree | b076c68dc1f72cbb105debed6a69251e76efd21d | |
| parent | 2e87d83d8d55bb0a7efd1d9ebc0888ee1b548fa5 (diff) | |
| parent | 00a13e22dd543b4e234d511569a46c8d63ea3db8 (diff) | |
| download | mruby-30576bf3c6224db2feaae95f91cb41d22d7df733.tar.gz mruby-30576bf3c6224db2feaae95f91cb41d22d7df733.zip | |
Merge pull request #5387 from shuujii/use-global-defines-for-mruby-bin-debugger
Use global defines for `mruby-bin-debugger`
| -rw-r--r-- | lib/mruby/build.rb | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-debugger/mrbgem.rake | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index f82eb9401..2339a3c89 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -352,14 +352,12 @@ EOS end def define_rules - use_mrdb = @gems["mruby-bin-debugger"] compilers.each do |compiler| if respond_to?(:enable_gems?) && enable_gems? compiler.defines -= %w(MRB_NO_GEMS) else compiler.defines += %w(MRB_NO_GEMS) end - compiler.defines |= %w(MRB_USE_DEBUG_HOOK) if use_mrdb end [@cc, *(@cxx if cxx_exception_enabled?)].each do |compiler| compiler.define_rules(@build_dir, MRUBY_ROOT, @exts.object) diff --git a/mrbgems/mruby-bin-debugger/mrbgem.rake b/mrbgems/mruby-bin-debugger/mrbgem.rake index 764f431af..091851dd4 100644 --- a/mrbgems/mruby-bin-debugger/mrbgem.rake +++ b/mrbgems/mruby-bin-debugger/mrbgem.rake @@ -2,7 +2,7 @@ MRuby::Gem::Specification.new('mruby-bin-debugger') do |spec| spec.license = 'MIT' spec.author = 'mruby developers' spec.summary = 'mruby debugger command' - + spec.build.defines |= %w(MRB_USE_DEBUG_HOOK) spec.add_dependency('mruby-eval', :core => 'mruby-eval') spec.bins = %w(mrdb) |