Merge remote-tracking branch 'origin/master'

2 files changed, 9 insertions, 7 deletions

diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index f5edc515b..2ed72c3ff 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -136,6 +136,7 @@ module MRuby
           unless rbfiles.empty?
             f.puts %Q[  mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});]
             f.puts %Q[  if (mrb->exc) {]
+            f.puts %Q[    mrb_print_backtrace(mrb);]
             f.puts %Q[    mrb_p(mrb, mrb_obj_value(mrb->exc));]
             f.puts %Q[    exit(EXIT_FAILURE);]
             f.puts %Q[  }]
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake
index a47633c51..1d69fa54d 100644
--- a/tasks/mruby_build_commands.rake
+++ b/tasks/mruby_build_commands.rake
@@ -236,20 +236,21 @@ module MRuby
   end
 
   class Command::Mrbc < Command
+    attr_accessor :compile_options
+
     def initialize(build)
       super
       @command = nil
-      @compile_options = "-B%{funcname} -o- -"
+      @compile_options = "-B%{funcname} -o-"
     end
 
     def run(out, infiles, funcname)
       @command ||= @build.mrbcfile
-      IO.popen("#{filename @command} #{@compile_options % {:funcname => funcname}}", 'r+') do |io|
-        [infiles].flatten.each do |f|
-          _pp "MRBC", f.relative_path, nil, :indent => 2
-          io.write IO.read(f)
-        end
-        io.close_write
+      infiles = [infiles].flatten
+      infiles.each do |f|
+        _pp "MRBC", f.relative_path, nil, :indent => 2
+      end
+      IO.popen("#{filename @command} #{@compile_options % {:funcname => funcname}} #{infiles.join(' ')}", 'r+') do |io|
         out.puts io.read
       end
     end