Unverified Commit 6f354322 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub

Merge pull request #5318 from shuujii/fix-breakage-where-builds-except-host-dont-refer-mrbc-in-host

Fix breakage where builds except `host` don't refer` mrbc` in `host`
parents c43dd75e f92c1f1b
...@@ -320,12 +320,16 @@ EOS ...@@ -320,12 +320,16 @@ EOS
return @mrbcfile if @mrbcfile return @mrbcfile if @mrbcfile
gem_name = "mruby-bin-mrbc" gem_name = "mruby-bin-mrbc"
gem = @gems[gem_name] if (gem = @gems[gem_name])
gem ||= (host = MRuby.targets["host"]) && host.gems[gem_name] @mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
unless gem elsif !host? && (host = MRuby.targets["host"])
fail "external mrbc or mruby-bin-mrbc gem in current('#{@name}') or 'host' build is required" if (gem = host.gems[gem_name])
end
@mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc") @mrbcfile = exefile("#{gem.build.build_dir}/bin/mrbc")
elsif host.mrbcfile_external?
@mrbcfile = host.mrbcfile
end
end
@mrbcfile || fail("external mrbc or mruby-bin-mrbc gem in current('#{@name}') or 'host' build is required")
end end
def mrbcfile=(path) def mrbcfile=(path)
......
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