Merge pull request #1597 from take-cheeze/mrbcfile

debug record size assertion fail

src/dump.c

@@ -547,8 +547,6 @@ write_debug_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const
   ret = cur - bin;
   uint32_to_bin(ret, bin);
 
-  mrb_assert((cur - bin) == (int)get_debug_record_size(mrb, irep));
-
   return ret;
 }
 
@@ -565,6 +563,8 @@ write_debug_record(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const*
     bin += len;
     size += len;
   }
+
+  mrb_assert(size == (int)get_debug_record_size(mrb, irep));
   return size;
 }
 

tasks/mruby_build.rake

@@ -103,7 +103,7 @@ module MRuby
     end
 
     def mrbcfile
-      MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/mrbc")
+      MRuby.targets[@name].exefile("#{MRuby.targets[@name].build_dir}/bin/mrbc")
     end
 
     def compilers
@@ -204,6 +204,10 @@ module MRuby
   super
     end
 
+    def mrbcfile
+      MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/mrbc")
+    end
+
     def run_test
       mrbtest = exefile("#{build_dir}/test/mrbtest")
       if (@test_runner.command == nil)

travis_config.rb

@@ -4,7 +4,7 @@ MRuby::Build.new('debug') do |conf|
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_GC_FIXED_ARENA)
+  conf.cc.defines += %w(MRB_GC_FIXED_ARENA)
 end
 
 MRuby::Build.new do |conf|
@@ -12,5 +12,5 @@ MRuby::Build.new do |conf|
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_GC_FIXED_ARENA)
+  conf.cc.defines += %w(MRB_GC_FIXED_ARENA)
 end