Commit cc98f191 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #2587 from take-cheeze/fix_def_gem_load

Fix default gem loading in `generate_gem_table`.
parents 3f70edbd e6ae5c86
...@@ -298,7 +298,7 @@ module MRuby ...@@ -298,7 +298,7 @@ module MRuby
@ary.empty? @ary.empty?
end end
def generate_gem_table def generate_gem_table build
gem_table = @ary.reduce({}) { |res,v| res[v.name] = v; res } gem_table = @ary.reduce({}) { |res,v| res[v.name] = v; res }
default_gems = [] default_gems = []
...@@ -381,7 +381,7 @@ module MRuby ...@@ -381,7 +381,7 @@ module MRuby
end end
def check(build) def check(build)
gem_table = generate_gem_table gem_table = generate_gem_table build
@ary = tsort_dependencies gem_table.keys, gem_table, true @ary = tsort_dependencies gem_table.keys, gem_table, true
......
MRuby.each_target do MRuby.each_target do
gem_table = gems.generate_gem_table gem_table = gems.generate_gem_table self
gems.each do |g| gems.each do |g|
test_rbobj = g.test_rbireps.ext(exts.object) test_rbobj = g.test_rbireps.ext(exts.object)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment