diff options
| author | Yuichiro MASUI <[email protected]> | 2013-01-04 01:31:58 +0900 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2013-01-04 06:07:24 +0800 |
| commit | d7668c5fd25519a6b3a0a53b92e1b27dbe832af2 (patch) | |
| tree | e54a46400ed8fb80a13f0bdda33d13da12245cb0 /tasks | |
| parent | 67541a3d6e22348a18822db9ae2871623568a765 (diff) | |
| download | mruby-d7668c5fd25519a6b3a0a53b92e1b27dbe832af2.tar.gz mruby-d7668c5fd25519a6b3a0a53b92e1b27dbe832af2.zip | |
Fixed pure ruby mrbgems can't compile and fixed build script wrong variable name
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/mruby_build.rake | 8 | ||||
| -rw-r--r-- | tasks/mruby_gem_spec.rake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index fad92c5e1..65c80ab6a 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -20,7 +20,7 @@ module MRuby attr_accessor :ld, :ldflags, :libs attr_accessor :ar attr_writer :cxx, :cxxflags - attr_writer :objcc, :objccflags + attr_writer :objcc, :objcflags attr_writer :asm, :asmflags attr_accessor :gperf, :yacc attr_accessor :cat, :git @@ -46,13 +46,13 @@ module MRuby end def cxx; @cxx || cc; end - def cxxflags; @cxxflags.empty? ? cflags : @cxxflags; end + def cxxflags; !@cxxflags || @cxxflags.empty? ? cflags : @cxxflags; end def objcc; @objcc || cc; end - def objccflags; @objccflags.empty? ? cflags : @objccflags; end + def objcflags; !@objcflags || @objcflags.empty? ? cflags : @objcflags; end def asm; @asm || cc; end - def asmflags; @asmflags.empty? ? cflags : @asmflags; end + def asmflags; !@asmflags || @asmflags.empty? ? cflags : @asmflags; end def ld; @ld || cc; end diff --git a/tasks/mruby_gem_spec.rake b/tasks/mruby_gem_spec.rake index 59a536e2c..ae6d46b95 100644 --- a/tasks/mruby_gem_spec.rake +++ b/tasks/mruby_gem_spec.rake @@ -147,7 +147,7 @@ __EOF__ build.compile_mruby f, rbfiles, "gem_mrblib_irep_#{funcname}" unless rbfiles.empty? f.puts "void mrb_#{funcname}_gem_init(mrb_state *mrb);" f.puts "void GENERATED_TMP_mrb_#{funcname}_gem_init(mrb_state *mrb) {" - f.puts " mrb_#{funcname}_gem_init(mrb);" unless objs.empty? + f.puts " mrb_#{funcname}_gem_init(mrb);" if objs != ["#{build_dir}/gem_init.o"] f.puts <<__EOF__ unless rbfiles.empty? mrb_load_irep(mrb, gem_mrblib_irep_#{funcname}); if (mrb->exc) { |