Skip to content
This repository
Browse code

Merge branch 'master' into iij

  • Loading branch information...
commit 2645727267005ea33b228a5dc5d089436522bc9e 2 parents 31ee88a + d3c7755
Tomoyuki Sahara tsahara-iij authored
6 tasks/mruby_build_commands.rake
@@ -68,7 +68,11 @@ module MRuby
68 68 def define_rules(build_dir, source_dir='')
69 69 @out_ext = build.exts.object
70 70
71   - generated_file_matcher = Regexp.new("^#{build_dir}/(.*)#{Regexp.escape out_ext}$")
  71 + if build_dir.include? "mrbgems/"
  72 + generated_file_matcher = Regexp.new("^#{build_dir}/(.*)#{Regexp.escape out_ext}$")
  73 + else
  74 + generated_file_matcher = Regexp.new("^#{build_dir}/(?!mrbgems/.+/)(.*)#{Regexp.escape out_ext}$")
  75 + end
72 76 source_exts.each do |ext, compile|
73 77 rule generated_file_matcher => [
74 78 proc { |file|
2  tasks/mruby_build_gem.rake
@@ -5,7 +5,9 @@ module MRuby
5 5 gemrake = File.join(gemdir, "mrbgem.rake")
6 6
7 7 fail "Can't find #{gemrake}" unless File.exists?(gemrake)
  8 + Gem.current = nil
8 9 load gemrake
  10 + return nil unless Gem.current
9 11
10 12 Gem.current.dir = gemdir
11 13 Gem.current.build = MRuby::Build.current

0 comments on commit 2645727

Please sign in to comment.
Something went wrong with that request. Please try again.