diff options
| -rw-r--r-- | build_config/boxing.rb | 8 | ||||
| -rw-r--r-- | lib/mruby/build/command.rb | 6 | ||||
| -rw-r--r-- | lib/mruby/core_ext.rb | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/build_config/boxing.rb b/build_config/boxing.rb index bc35f1600..4b07c22e1 100644 --- a/build_config/boxing.rb +++ b/build_config/boxing.rb @@ -1,8 +1,8 @@ -BOXINGS = %w[no word nan] -BITS = [64, 32] -INTS = [64, 32] +boxings = %w[no word nan] +bits = [64, 32] +ints = [64, 32] -BOXINGS.product(BITS, INTS) do |boxing, bit, int| +boxings.product(bits, ints) do |boxing, bit, int| next if boxing == "nan" && int == 64 MRuby::Build.new("boxing-#{boxing}-m#{bit}-i#{int}") do |conf| diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb index e6becd3f6..6b8aca04a 100644 --- a/lib/mruby/build/command.rb +++ b/lib/mruby/build/command.rb @@ -317,9 +317,9 @@ module MRuby out.puts io.read end # if mrbc execution fail, drop the file - if $?.exitstatus != 0 - File.delete(out.path) - exit(-1) + unless $?.success? + rm_f out.path + fail "Command failed with status (#{$?.exitstatus}): [#{cmd[0,42]}...]" end end end diff --git a/lib/mruby/core_ext.rb b/lib/mruby/core_ext.rb index 3b2406c36..c404bfec9 100644 --- a/lib/mruby/core_ext.rb +++ b/lib/mruby/core_ext.rb @@ -27,7 +27,7 @@ def install_D(src, dst) end def _pp(cmd, src, tgt=nil, indent: nil) - return if Rake.verbose + return if Rake.application.options.silent width = 5 template = indent ? "%#{width * indent}s %s %s" : "%-#{width}s %s %s" |